gitbuster icon indicating copy to clipboard operation
gitbuster copied to clipboard
verified publisher icon mike-perdide

Gitbuster special mode doesn't work after git pull --rebase conflicts

Open mike-perdide opened this issue 14 years ago • 1 comments

mike-perdide avatar Jul 10 '11 12:07 mike-perdide

How to reproduce :

git add remote other <url>
git pull --rebase other
[get conflicts]

At this point, to enter conflict mode, gitbuster is looking for .git/rebase-merge, that you don't have. However, you do have a .git/rebase-apply dir, which I guess might somehow be of use.

feth avatar Jul 18 '11 22:07 feth