This is with Sourcetree for Windows 184.108.40.206
So I've tried to create a workflow between sourcetree and stash, where you can work on a feature branch, create a pull request from it, make changes to satisfy commentators in a code review, and then SQUASH those changes (or even changes from the branch) at the end to avoid cluttering the history.
More or less then would give you one entry in this history from merging the feature into main.
However, when I try to do this using sourcetree with "interactive rebase" by simply squashing the commits, if there are any conflicts at all between entries in the history of the feature branch (though the combined state certainly has no conflicts), then it fails saying it can't apply one of the conflicting commits onto one of the earlier ones.
With my understanding of Git this expected (though should be something you can automate as the final state has no conflicts), but the problem is instead of letting me resolve the conflicts and continue the rebase (doesn't matter if I click "amend commit" or not), IT ABORTS EVERY TIME once I click ok!
I saw one other post here about that suggesting you can use the terminal before hitting ok as a workaround, but this isn't really acceptable. Is this bug or an unfinished feature?
Any other workarounds?
Here's a workaround from the bug report that Morgan posted. Workaround was shared by Joe D:
I found a slightly better workaround:
1. Just close SourceTree entirely by right clicking on the taskbar button and clicking Close. (Don't click the Close button on the error message)
2. Re-open SourceTree and resolve the conflicts, then Commit. (the commit message will have to be entered manually - another bug)
3. Click Actions > Continue Rebase.
(repeat as above for any additional conflicts)
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
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
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot