Am I doing merge wrong? History is lost

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:

  1. Checked out the master branch
  2. Merged branch #375 into master branch
  3. Committed and pushed

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?

SourceTree screenshot

**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.

2 answers

1 accepted

2 votes
Accepted answer

The problem was solved by checking "Create a new commit even if fast forward is possible"

Good call. I guess my work repo is active enough that fast forwards are never possible expect when I'm pulling.

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.

Actually it was as simple as checking "Create a new commit even if fast-forward is possible", but your answer lead me on track so thanks.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

962 views 4 2
Read article

Atlassian User Groups

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!

Find my local user group

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

Groups near you