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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
so this fix will be in v 0.9.3 as I understand...or? btw, great feedback from you guys!!
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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!
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.