sourcetree interactive rebase not working

#Sourcetree interactive rebase not working windows#

I would argue that sorting the commits in the order they will be applied (like git rebase -i does) is more intuitive both to people who are experienced with git rebase -i and to people who only use SourceTree (provided that the order of commits is explained in the rebase dialog).įinally, I just noticed that if you press 'cancel' in the rebase dialog, you get an error message: I understand that it's intuitive to use the same order in the rebase window as in the main commit history, but squashing gets very unintuitive with this order. It seeems like this ties into the reversed sort order that SourceTree uses in interactive rebase (git rebase -i sorts the commit with the oldest first, while SourceTree interactive rebase sorts the newest commit first).

I would squash the first (oldest) fixup into the main commit, then the second fixup, etc. However, given the workflow I use, this is not at all intuitive. However, squashing the commits in the opposite order does seem to work as expected (First 'fifth commit', then 'fifth commit (+1 squashed commits)', then 'fifth commit (+2 squashed commits)'). This leads to SourceTree starting with applying 'fifth commit' to 'first commit', which quite likely will fail with a merge conflict. Now, selecting 'fourth commit' and 'squash with previous' gives this: Consider this commit history.ĭoing interactive rebase on 'first commit' here, and then selecting 'third commit' and 'squash with previous' gives this: Secondly, and the reason for this bug report is that when squashing multiple commits they very easily end up out of order, leading to a merge conflict and failed rebase. I can't even imagine a use case where the current behaviour is desired. When I squash these two, I almost always want the oldest commit message, and not the newest as I get today.

Typically, I have an older commit called 'Implement feature X', and then a newer commit called 'Fixup feature X'.

#Sourcetree interactive rebase not working windows#

The interactive rebase function in SourceTree is very confusing.įor starters, when using 'squash with previous', the commit message that 'wins' is the newest one. Resolution: Unresolved Affects Version/s: 1.9.6.2 Fix Version/s: None Component/s: Git Labels: interactive-rebase rebase squash Environment: Windows 10, System Git 2.10.2 Symptom Severity: Severity 2 - Major Description The interactive rebase function in SourceTree is very confusing.