Uploaded image for project: 'Sourcetree for Windows'
  1. Sourcetree for Windows
  2. SRCTREEWIN-13594

Squashing With Previous ignores the last item in the list

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Low
    • None
    • 3.4.4
    • General
    • Severity 1 - Critical

    Description

      Summary:

       

      When I try and Rebase Interactively and I have 5 commits. After Squashing With Previous, the last commit, doesn’t get squashed. Please see this SO question for more details:

      [https://stackoverflow.com/questions/42221088/how-to-properly-squash-commits-using-sourcetree]

      Detail:

      We're using Git as our source control system, and I like to commit my code on a regular basis. This does mean that when I'm ready to push to the shared repo I've created quite a few nonsense commits that I'd like to squash away before pushing.

      Using SourceTree that should be a simple thing, but I keep running into issues where not all selected commits are being squashed together. Let me show some images of what I do using a sample repo with some checkins:

      I click the first checking and choose to 'rebase children interactively'

      A pop will appear with all the checkins:

      On this popup I click the 'fifth' checkin and hit the squash with previous 3 times until the screen looks like this:

      All's fine you'd think, but then when hitting the 'ok' button, this is what I end up with:

      Why oh why does it not include the 'Second' commit in the end result? Judging by the looks of the popup you'd think this is included as well. I can do the same thing again to get the second in there, but I just can't fathom why it works this way or how to squash them all in one go:

       

      Attachments

        Activity

          People

            Unassigned Unassigned
            405b41d8e6dc Charles Robertson
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: