将master与第二分支合并并提交给master

Question

I'm very new to Github and I've created a branch about 2 weeks ago. This branch is now final and I'd like to move those updated to my master.

I've tried reading up on the subject and found that I should do:

git checkout master

git merge picto_gone (The branch I'd like to merge)

This works fine and I see all the editted files and a 'fast-forward' thingie.

Now; If I go back to my github.com page I see that my master is still last updated * days ago. And not today or the last commit on my other branch for that matter.

If I try to commit it says my branch is ahead 6 commits.

Long story short: How do I merge my branch with my master so I can start using my master again?

Answer 1

git pull
git push origin master

you must push your change to trunk.

Answer 2

您必须将本地“ master”分支发送到github。

git push