Skip to content

Instantly share code, notes, and snippets.

@cleberjamaral

cleberjamaral/Merging-branch-into-master.md

Last active February 9, 2020 23:42
Show Gist options
  • Save cleberjamaral/94410e296e80aa66f0d38c88ca5234fe to your computer and use it in GitHub Desktop.
Save cleberjamaral/94410e296e80aa66f0d38c88ca5234fe to your computer and use it in GitHub Desktop.
Download ZIP
Merging git branch into master
Raw
Merging-branch-into-master.md

Merging git branch into master

  1. go to master git checkout master

  2. make sure it is updated solving conflicts if they exist git pull origin master

  3. merge with the branch (list of branchs can be obtained by git branch) git merge branch_name

  4. push merged local repository git push origin master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment