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

Sourcetree showing wrong Merge information

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Medium Medium
    • None
    • 3.1.2
    • Bitbucket, Git
    • None
    • Windows 10, using Bitbucket website as git repo

    • Severity 3 - Minor

      I created a test branch to demonstrate this issue, https://bitbucket.org/wakefly_cbass/test/commits/all

      I created an initial commit, 13b2c38 , and a second commit. 0b1f714, directly on master.
      At this point, I switched back to 13b2c38 and created two branches off of it, Branch1 and Branch2.

      I proceeded to do a third commit onto Branch1 (CreateBranch1.png), and a fourth onto Branch2 (CreateBranch2.png).
      I then did a merge of Branch1, and then Branch2, into master.

      In Bitbucket, this shows up cleanly - I've only committed one file to each branch, and when they merge only one branch is shown.

      But in SourceTree, each merge shows an extraneous file not shown in BitBucket - Merging Branch 1 shows the second commit (0b1f714) as part of the merge, and Merging Branch 2 shows the file from Branch 1 as part of the merge. (MergeBranch1.png, MergeBranch2.png)

      As a followup, after this, any merges involving these branches, will forever also show that file as part of the merge. (Branch2MergeAgain.png)

      The issue persists, even if the repo is deleted entirely from SourceTree, and pulled again from Bitbucket,

        1. Branch2MergeAgain.png
          Branch2MergeAgain.png
          58 kB
        2. branch-creation.png
          branch-creation.png
          41 kB
        3. CreateBranch1.png
          CreateBranch1.png
          57 kB
        4. CreateBranch2.png
          CreateBranch2.png
          51 kB
        5. MergeBranch1.png
          MergeBranch1.png
          60 kB
        6. MergeBranch2.png
          MergeBranch2.png
          59 kB

              Unassigned Unassigned
              5d57bf5dd539 wakefly_cbass
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Created:
                Updated:
                Resolved: