[gmx-developers]: Gerrit: Update: Submit with merge pending is OK, was: Please don't submit while merge is pending

[Roland Schulz]

Hi,

I got a suggestion on the Gerrit mailing list how to rebase merges:
https://groups.google.com/group/repo-discuss/msg/9ed112b5109066f8 . Thus we
can now rebase merges if we have to and it isn't important anymore to check
whether merges are pending before submitting a change.
The process is not fool proof so I don't recommend it unless you have a
pretty good understanding of git. In that case just leave the rebasing of a
merge to me.

 I'm going to install Gerrit 2.4 next week. The main new feature is that it
has a rebase button for normal changes. Thus it will remove the need to
manually upload a rebase. Instead one can just press the button. I have
installed 2.4rc1 at https://gerrit.gromacs.org:444/#/q/status:open,n,z (it
is a test server so feel free to make any changes you want).

Roland

On Sat, Apr 28, 2012 at 9:22 PM, Schulz, Roland <rschulz3 at utk.edu> wrote:

>  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
>



-- 
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/20120516/b447d88b/attachment.html>