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