[gmx-developers] Gerrit: Please don't submit while merge is pending

[Roland Schulz]

Hi,

a wish: please don't submit any changes in gerrit while a merge for that
branch is pending. It isn't possible to rebase a merge and repeatedly
redoing complex merges because of merge conflicts is a pain.

BTW: We could activate that Gerrit auto merges files. We would still need
to manually resolve/rebase commits if they have conflicts (changes to close
by lines). But Gerrit would auto-merge changes to the same file if they are
non-conflicting.
Do you think I should do that? It would certainly be quite a bit more
convenient. It would also my wish less relevant because it would be much
less frequent that commits would need to be manually rebased. We stopped
reviewing trivial (=non-conflicting) rebasing anyhow. The only thing we
would loose is that Jenkins wouldn't recheck the rebase/merge.

Roland

-- 
ORNL/UT Center for Molecular Biophysics cmb.ornl.gov
865-241-1537, ORNL PO BOX 2008 MS6309
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://maillist.sys.kth.se/pipermail/gromacs.org_gmx-developers/attachments/20120428/457640c1/attachment.html>