In my repo I have the master
and a new_branch
. I add files to the new one, commit and push them to remote repo. Then I've merged the new one into the master with the following steps:
git checkout master (up-to-date)
git merge new_branch (no conflicts)
I see the fast-forward merge and all new files. No errors, no conflicts. Then:
git checkout master
tells me my local repo is 2 commits ahead against origin/master, so I push
. Now if I checkout master, it is up to date but, I can't see the merge I've done:
git log --decorate --graph
The only commmit it shows is the one I 've done into the new_branch
just before merging it. And also graphically there is no evidence of the merge. Is it normal?