A week ago I started a new branch in SourceTree by clicking the big Branch button, selected "New branch" and gave it name "#375". I then did a handful of commits before merging into the master branch by following the following procedure:
Se image below. Why do I not see the blue line splitting into two lines at the "original branch point", and then being merged into one line again at the "merge point"?
I'm fairly new to both git and SourceTree, but I'm familiar with mercurial hg, in which this procedure was trivial. I was expecting the same procedure to work here. Help?
**Edit**: I realize I haven't done any commits on the master branch in the meantime, which may be the cause for it being invisible. Yet I'd still like to know the point at which I started branch #375 for historic reasons. For instance if I want to rollback the feature represented by this branch.
It looks like you checked the "rebase" option which re-writes your history to make it appears as though all the commits from one branch (#375) were made directly to the other (master).
To fix you history, checkout master and do a hard reset to the original branch point. Then run the merge again, and make sure NOT to rebase.
Atlassian Summit is an excellent opportunity for in-person support, training, and networking.Learn more
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