Gerrit is currently very conservative and refuses to submit a change
if another user touched a same file in the meantime, even if the two
changes done in that file don't conflict with one another.
For people used to perforce, this is fundamentally the same behavior
(where p4 submit refuses to submit if #have is different from #head
for any of the files being submitted). The unfortunate difference here
is that the git/Gerrit-based workflow can ripple down into a lot more
work than a plain "p4 sync <affected file>; p4 resolve -am ; p4
submit".
I'd like to have Gerrit offer more flexibility here (i.e. show the
diffs on both sides and let the submitter submit anyway, or only
report path conflicts if the lines being changed are less than
20-or-so lines apart), so that in many circumstances there'd be no
need to rebase, as that rebase really hurts the workflow.
JBQ
--
Jean-Baptiste M. "JBQ" Queru
Software Engineer, Android Open-Source Project, Google.
Questions sent directly to me that have no reason for being private
will likely get ignored or forwarded to a public forum with no further
warning.