Skip to content

Instantly share code, notes, and snippets.

@pontiyaraja

pontiyaraja/Git conflict

Created January 28, 2016 12:38
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save pontiyaraja/5384e6248c7a1c143272 to your computer and use it in GitHub Desktop.
Save pontiyaraja/5384e6248c7a1c143272 to your computer and use it in GitHub Desktop.
Download ZIP
Resolve git conflict in command line
Raw
Git conflict
Step 1: From your project repository, bring in the changes and test.
git fetch origin
git checkout -b server origin/server
git merge master
Step 2: Merge the changes and update on GitHub.
git checkout master
git merge --no-ff server
git push origin master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment