Re: [PATCH] rebase--merge: fix --skip with two conflicts in a row

"brian m. carlson" writes: > If git rebase --merge encountered a conflict, --skip would not work if the > next commit also conflicted. The msgnum file would never be updated with > the new patch number, so no patch would actually be skipped, resulting in an > inescapable loop. > > Update the msg

[PATCH] rebase--merge: fix --skip with two conflicts in a row

If git rebase --merge encountered a conflict, --skip would not work if the next commit also conflicted. The msgnum file would never be updated with the new patch number, so no patch would actually be skipped, resulting in an inescapable loop. Update the msgnum file's value as the first thing in c