Uncommitted changes after a merge appear to have two parents

XMLWordPrintable

    • Type: Suggestion
    • Resolution: Fixed
    • 1.3.1
    • Component/s: None
    • None

      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
          455 kB
          Brooks Boyd
        2. test.zip
          21 kB
          Brooks Boyd
        3. test-after.jpg
          158 kB
          Brooks Boyd
        4. Test-before.jpg
          153 kB
          Brooks Boyd

            Assignee:
            Unassigned
            Reporter:
            Brooks Boyd
            Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

              Created:
              Updated:
              Resolved: