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

Switching branch and hit 'pull' to fast causes a pull of the old branch into the new one

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Highest
    • 2.1.10.0
    • 2.1.2.5
    • General, Git
    • None
    • Severity 1 - Critical

    Description

      working with git:

      switching branch and hit 'pull' sometimes leads to an unwanted merge, as the 'old' branch is selected.

      e.g.

      actual branch is "branch1"

      now switching branch to "branch2" and hit 'pull' -> active branch is "branch2" but in the pull window there is still "branch1" selected to pull (should be "branch2"). If this isn't noticed by the user, this results of pulling the sources of "branch1" into "branch2", which might result in an unwanted merge of branch1 into branch2. 

      Seems to be a timing bug, imho the push and pull options should be disabled while switching a branch. 

      This is especially annoying if fast forward is not disabled. 

       

      UPDATE: SEEMS TO BE RESOLVED WITH 2.1.10.0

      UPDATE: Reproduced with 2.3.1.0 on the first try. 

        

      Attachments

        1. fast-pull-bug.png
          59 kB
        2. Sourcetree suggest pulling master branch while on dev.png
          100 kB
        3. SRCTREEWIN-7592-1.PNG
          16 kB
        4. SRCTREEWIN-7592-2.PNG
          15 kB

        Activity

          People

            Unassigned Unassigned
            c05a78370ebc Yves Dünow
            Votes:
            6 Vote for this issue
            Watchers:
            4 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: