On Thu, Sep 27, 2012 at 10:54 AM, Roan Kattouw <roan.kattouw(a)gmail.com> wrote:
Yes and no. The person that merges the branch can
create a merge commit and
submit that for review (git checkout -b mergewikidata master && git merge
wikidata && git review) but Gerrit will not show the diff properly: it'll
either show just the conflict resolutions, or nothing at all. You can view
the full diff by fetching the commit on your localhost and using standard
git tools (e.g. git review -d 12345 && git show), but you won't be able to
use inline comments quite as nicely.
Someone could create a faux commit (with "DO NOT MERGE" on it) which
is not a merge commit, but a fully squashed, rebased single commit.
That would give a target for inline review comments. I'm not
volunteering to do that myself, but anyone could do that, and drop a
comment on bug 38622.
Rob