Question

I’m new to git.

I made a branch, did my changes, and now I want to merge back to master to make them “permanent”.

So I did git merge 1.2 which reported as already up-to-date, did the same on master to the same result, and tried merge -v HEAD master which gave me a slightly different up-to-date message.

So is what I did correct? Should I be doing something else? How do I switch back to the master branch?

Answer 1

You need to be on the master branch to merge into it.

git checkout master
git merge some_development_effort