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

mike-perdide / gitbuster

PyQt4 frontend for git filter-branch/git cherry-pick.

GNU General Public License v3.0

24 stars 0 forks source link

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

Open mike-perdide opened 13 years ago

feth commented 13 years ago

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.