Interactive Rebase in SourceTree Windows doesn't work properly at all

I'm using SourceTree 1.5 on Windows. Interactive Rebase almost never works. Here are some of the issues:

  • Commits are ordered wrong. Interactive rebase from the command line lists commits from OLDEST (top) to NEWEST (bottom). The rebase window puts the newest on the TOP. This is backwards and causes problems with this feature working properly.
  • If I have 15 commits on my branch and I want to squash them all into one, what I do is select the top commit and spam the "Squash With Previous" button until I have only 1 commit shown. After this, I accept, it doesn't squash all of them. I'm left with a log that shows only 2 commits were squashed instead of all 15 like it showed it would do. Again, i think this is due to the bad ordering mentioned in my first point.
  • If I squash commits and then rename them, the rename isn't applied along with the squash. This may not be working because of the 2nd point.
  • Can't select a range of commits to squash together. I have to do them one at a time, this is a serious usability issue.

Is it just me or are others experiencing this issue? I have a feeling the bad commit ordering is the culprit of most of these problems.

10 answers

I noticed this too. It only squashes 2 of them at a time for me, no matter how many commits I try to squash together.

2017 and still an issue. I can repeat exactly the same steps - sometimes it squishes 2 or 3 commits and other times none and sometimes fails.

And this is in a clean repo with one feature branch and one text file - hardly complicated.

I've noticed when it does fail the window states to use abort, ignore etc and when I try to it says I'm not rebasing. So it looks like if it fails it aborts, then tells you to abort, then when you try to it tells you there's nothing to abort...

I think Atlassian are too busy buying other companies to shoddily integrate with rather than build a solid foundation on which to work. A shame really.

For rebasing, the easiest workaround seems to be to use the command line.  Rebasing doesn't seem to work too well in GUI's, even IntelliJ.

I've found that the command like `git rebase --interactive HEAD~5` will interactively rebase your last 5 commits, which helps.

I've seen this same problem repeatedly also.  Good diagnosis.

This question is asked on StackOverflow and there is a workaround listed there.

So this was asked June 2014. It's July 2015 and it's still a problem, and no response from Atlassian. I think it's time for me to ditch SourceTree.

This is a serious bug. Could someone please take a look at it?

I can confirm this is still an issue.  Thanks for the links to that article.  I used git reset to squash all my commits.  It would be nice if this issue would get fixed.

I am able to use this feature, but I can only do a maximum of 3 commits at a time (squashed down to 1). 

I use this feature frequently and I would also like it fixed; I entered my issue below almost 2 years ago at this point.

Having the same issue in 1.8.3 - no matter how many commits you select, it will only squash together at most 3.

 

I have an issue with rabse and conflicts on the latest version of sourcetree. When I mark as resolved the files disappear and then git tells me that there are no changes to make, and tells me to continue, skip or abort.

The changes are just gone!!

Now that you've resolved the conflicts, you need to tell it to continue.  That is how Git works and isn't related to SourceTree.

well yes, when I told it to continue it couldn't.

And when I continue from sourcetree, I finish fixing all the conflicts, commit by commit, I do not have the push option and my changes disappear. Me and my collegues at work are having a problem with rebasing since the last version.

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

560 views 1 2
Read article

Atlassian User Groups

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!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you