On 10/28/2009 05:28 PM, Anthony Liguori wrote:
Gerd Hoffmann wrote:
Hi,
Should either Gerd or I have merged the others' changes into our tree
and asked you to pull? Should you just refuse conflicts and ask us to
re-post? Or ...?
I think the best way to deal with that would be to simply not merge
stuff which doesn't apply. Likewise for stuff which doesn't build.
Pick one patch series, merge it, ask for a rebase of the other
series, i.e. basically offload the conflict resolving to the patch
submitter. Reduces your workload and non-trivial conflicts are better
handled by the submitter anyway.
That would require a series to be merged within a very short time
period which does not allow appropriate review on the list.
Why? When you detect the conflict, ask the unlucky second to rebase (on
top of some git branch). The rebased series doesn't need a re-review
unless the submitter says he needed to rework it significantly.
(IOW, the submitter's rebase doesn't need more review than your conflict
resolution)
--
error compiling committee.c: too many arguments to function
