How to merge from two branches

Question

There are two branches. I've pushed a commit in branch working . Now I want to merge it in master branch. How to do that and are there any possible conflicts? I mean if in my local machine I don't have some actual code from branch master , how should I merge them? Should it looks like this:

 git checkout master git merge working git push origin master 

Answer 1

Steps to merge branch "working" into branch "master":

1. Make your code changes to "working"
2. Commit changes locally
3. Push "working" branch to remote repo

4. Checkout "master" branch

   $ git checkout master

5. [If you don't have the latest code]Pull from remote "master" to make sure your code is up to date:

   $ git pull origin master

6. Merge branch "working" into "master"

   $ git merge working

7. Fix any conflicts that may arise

8. Test!

9. If all is ok, push "master" back out to remote

   $ git push origin master

When you merge "working" into "master", there can definitely be merge conflicts. There is no way for us to predict whether or not you'll run into any, as that depends on what changes you have made in "working", and work others may have done on "master".