Sublime Forum

Bug - Incorrect diff shown when squashing

#1

When using CMD+click to squash 2 commits, it seems to be showing the wrong commit after you CMD+click the second commit.

e.g. you have commits A - B - C (from top to bottom), if you select A, then CMD+click C, B is shown in the preview pane on the right (I would expect either A or C to be shown, since those are the 2 I’m working on).

Right clicking C and choosing “Squash Selected Commits, ignoring new messages (fixup)” does correctly merge A and C (and properly discards the commit message from A).

0 Likes
#2

When you select two commits, the previw pane on the right shows the differences between these two commits. In your example, it should show the contents of B and A combined.

1 Like