Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Interactive rebase for squashing pull request ALWAYS aborting.

This is with Sourcetree for Windows 1.6.8.0

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?

5 answers

This was supposed to be fixed in 1.6, but appears to still be an issue.

I have a new bug open @ https://jira.atlassian.com/browse/SRCTREEWIN-2493

Is there anything happening around that bug? It is over a year when it was found and the issue still exists in 1.6.22

This was supposed to be fixed in 1.6, according to https://jira.atlassian.com/browse/SRCTREEWIN-1880

Huh, well it's clearly broken again. Maybe something different about my use case, I guess I should make a new bug on jira? Assuming I can, not sure how that works for Atlassian.

You can definitely create a new bug. Seems appropriate. Post the link to it as an answer to this question to help others find it and vote for it.

Any resolution on this?

This seems to still be happening as of mid-2016 (SourceTree Windows 1.8.3) !!!
This completely removes the usefulness of the crucial interactive rebase feature. What's the current workaround for this?

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)

Workaround works, but is quite odd.

Any changes on this?

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Posted in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

3,259 views 19 18
Join discussion

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you