I was working on a branch. I merged master onto my branch and then made another commit on my branch, without pushing it. Pride update blew up with a rebase conflict.
Pride tried to rebase my local branch onto a commit on the remote branch but my local branch already contained those changes. Git status during rebase gives:
You are currently rebasing branch 'test' on '7dfc05a'.
I was working on a branch. I merged master onto my branch and then made another commit on my branch, without pushing it. Pride update blew up with a rebase conflict.
Pride tried to rebase my local branch onto a commit on the remote branch but my local branch already contained those changes. Git status during rebase gives:
You are currently rebasing branch 'test' on '7dfc05a'.
git log gives:
Here is a shell script to reproduce: