Uploaded image for project: 'Sourcetree For Mac'
  1. Sourcetree For Mac
  2. SRCTREE-833

Uncommitted changes after a merge appear to have two parents

XMLWordPrintable

    • Icon: Suggestion Suggestion
    • Resolution: Fixed
    • 1.3.1
    • None
    • None
    • Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.

      After a merge commit, the node in the tree view that indicates the uncommitted changes has parent lines drawn to the merge commit, AND the head of the branch that was merged into the commit prior (see attachment: see that the uncommitted node attaches to the head of the green (leftmost) branch, and the head of the purple (second from left) branch that was merged with the green branch the last commit). After committing, the new commit only has one parent (the merge commit), which is correct. It's only the view when it's not committed yet that's inaccurate; it should only point to the head of the currently-active branch.

        1. SourceTree_graph.png
          SourceTree_graph.png
          455 kB
        2. test.zip
          21 kB
        3. Test-before.jpg
          Test-before.jpg
          153 kB
        4. test-after.jpg
          test-after.jpg
          158 kB

              Unassigned Unassigned
              69c85fa7b8fe Brooks Boyd
              Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

                Created:
                Updated:
                Resolved: