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
You can resolve this in SourceTree. Here's what happens and what you should do:
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.
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!
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG