Hi,<div><br></div><div>I got a suggestion on the Gerrit mailing list how to rebase merges:
<a href="https://groups.google.com/group/repo-discuss/msg/9ed112b5109066f8">https://groups.google.com/group/repo-discuss/msg/9ed112b5109066f8</a> . 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.</div>
<div>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.</div><div><br></div><div> 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 <a href="https://gerrit.gromacs.org:444/#/q/status:open,n,z">https://gerrit.gromacs.org:444/#/q/status:open,n,z</a> (it is a test server so feel free to make any changes you want). </div>
<div><br></div><div>Roland</div><div><div><br><div class="gmail_quote">On Sat, Apr 28, 2012 at 9:22 PM, Schulz, Roland <span dir="ltr"><<a href="mailto:rschulz3@utk.edu" target="_blank">rschulz3@utk.edu</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div>
Hi,
<div><br>
</div>
<div>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.</div>
<div><br>
</div>
<div>
<div>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.</div>
<div>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.</div><span class="HOEnZb"><font color="#888888">
<div><br>
</div>
<div>Roland</div>
<div><br>
</div>
-- <br>
ORNL/UT Center for Molecular Biophysics <a href="http://cmb.ornl.gov" target="_blank">
cmb.ornl.gov</a><br>
<a href="tel:865-241-1537" value="+18652411537" target="_blank">865-241-1537</a>, ORNL PO BOX 2008 MS6309<br>
</font></span></div>
</div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>ORNL/UT Center for Molecular Biophysics <a href="http://cmb.ornl.gov">cmb.ornl.gov</a><br>865-241-1537, ORNL PO BOX 2008 MS6309<br>
</div></div>