Skip to content

Instantly share code, notes, and snippets.

@sibysathyanesan

sibysathyanesan/Git Merge

Created August 14, 2020 17:43
Show Gist options
  • Save sibysathyanesan/0bb5a7e2c2a57268fd07644a9730e1ad to your computer and use it in GitHub Desktop.
Save sibysathyanesan/0bb5a7e2c2a57268fd07644a9730e1ad to your computer and use it in GitHub Desktop.
Download ZIP
Raw
Git Merge
git checkout <branch name>
git merge master
**resolve conflicts**
git checkout master
git merge --no-ff <branch name>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment