nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Am I doing merge wrong? History is lost

Frode Nilsen_5dhycj

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:

Checked out the master branch
Merged branch #375 into master branch
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.

Accepted answers

Frode Nilsen_5dhycj

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

All comments

Seth

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.

Frode Nilsen_5dhycj

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.

Frode Nilsen_5dhycj

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

Seth

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