GitFlow finish feature with rebase doesn't work (WIN)

[Johan Leino]

When I finish a feature in GitFlow and use rebase option I get this:

"Finish was aborted due to conflicts during rebase.

Please finish the rebase manually now.

When finished, re-run:

git flow feature finish 'myfeat' 'development'"

However, checking there are no conflicts and I can do it manually...through command-prompt

[stevestreeting · Accepted solution]

You can resolve this in SourceTree. Here's what happens and what you should do:

1. You Finish Feature with the Rebase option, and there are conflicts. SourceTree pops up a dialog saying you now have conflicts in your working copy that you need to resolve
2. You resolve the conflicts using the file context submenu Resolve Conflicts - either use a merge tool, take one side or the other, etc.
3. Once you've done that and there are no conflicts remaining, you continue the rebase. You can either do that via the Actions > Continue Rebase option, or you can use any Commit shortcut and SourceTree will prompt you to Continue or Abort the rebase anyway, because it knows the state and what should happen next.
4. If more conflicts occur, repeat 2-3
5. Once the rebase has finished, you will still be on the feature branch but the rebase has happened. So now you use the Finish Feature option again and everything will resolve.

[Johan Leino]

Yes I know how to rebase and solve conflicts. The problem is that there are no conflicts. I think there might be a bug in the rebase option when finishing a feature. It doesn't seem to work through the UI. If I do a manual rebase it works without any conflicts. It is the windows version btw.

[stevestreeting]

Yeah, I was testing this on the Windows version as well, and I couldn't reproduce that error with or without conflicts. Will try again.

[stevestreeting]

My bad, I had a symlink hanging around in my embedded git version which was hiding this silently. Logged here: https://jira.atlassian.com/browse/SRCTREEWIN-548

[Johan Leino]

so this fix will be in v 0.9.3 as I understand...or? btw, great feedback from you guys!!

[stevestreeting]

Yep, I squashed it yesterday so it will be in the next update, 0.9.3. This will go out via our new installer / update system BTW, as discussed here: http://blog.sourcetreeapp.com/2013/05/13/new-installer-updater-for-sourcetree-for-windows/. I was not intending to do this update until next week though, can you manage until then? If it's a major problem for you we can possibly give you an out-of-band patch release in the mean time.

Glad to help!

[Johan Leino]

no worries...I'll hold on