I added the workaround and background to
https://www.mediawiki.org/wiki/Gerrit/resolve_conflict , which also
covers gerrit rebase failures.
On Mon, Apr 8, 2013 at 2:54 PM, Roan Kattouw roan.katt...@gmail.com wrote:
About a year ago, we were struggling with a git-review bug that caused
lots of
On Mon, Apr 8, 2013 at 11:54 PM, Roan Kattouw roan.katt...@gmail.comwrote:
The workaround is the same as last year: if git-review complains and
you see bogus commits in the list, respond no to abort, run git
fetch gerrit, then rerun git-review. This will ensure git-review has
an up-to-date
On 9 April 2013 00:54, Roan Kattouw roan.katt...@gmail.com wrote:
The workaround is the same as last year: if git-review complains and
you see bogus commits in the list, respond no to abort, run git
fetch gerrit, then rerun git-review. This will ensure git-review has
an up-to-date view of the
About a year ago, we were struggling with a git-review bug that caused
lots of bogus warnings to appear. When running git review, you'd get
a warning saying you're about to submit multiple commits, followed by
a list of lots of other people's commits that have already been
merged. I fixed this in
