Skip to content

Instantly share code, notes, and snippets.

@datduyng

datduyng/git-cheatsheet.md

Created December 18, 2018 05:16
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save datduyng/dcdc7c575adfbb46da613bae77de7c00 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save datduyng/dcdc7c575adfbb46da613bae77de7c00 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git-cheatsheet.md

Merging

Merger from branch to master

git checkout master 
git pull #update local master from remote before merge 
git merge BRANCH_NAME # resolve conflict if there are any
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment