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

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.