After merge, the master branch shows a graph I did not understand at all.
So I was at commit id 4255f88, the other guy merged my code and proceeded to commit id 647b2fd, then I merged his 647b2fd and get c3193e1. But the branch tree did not show the graph I expected (as I pointed here), instead it shows my latest commit id c3193e1 is merged from that purple one, which I have no idea at all where does it come from?!
BTW, here I chose "create a commit even fast-forward", but I had tried fast-forward either and got the same result.
You do have uncommitted changes (the top line in the screenshot, with the empty grey circle on the left in the graph and "*" in the Commit column), which have two parents (the two grey lines coming from the empty circle). This means that you are in the middle of a merge. You can use the "Reset All" Option in the Discard dialog to abort the merge.
I just clicked merge button and sourcetree popped up a dialog said "Pick a commit to merge into your current branch". This is what I always do when I merged others' codes and I nerve had a problem before till now. I just want to get rid of that purple line and let my latest commit shows it came from 647b2fd. What can I do now ?
I've seen this before as well. Occasionally when I merge a branch into my own (I merge branches, not commits), SourceTree draws the graph such that the merge parent is some commit in the distant past that I can't find rather than the recent commit that is the head of the branch I merged.
I haven't been able to figure out how to consistently reproduce this or whether it's a bug in SourceTree or Git. It doesn't really have any impact on my workflow, so I just ignore it. If you want to file a bug - jira.atlassian.com.
As Balazs said, you've already pushed to origin, so there's not much you can do to fix it at this point.
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs