Skip to content

Latest commit

 

History

History
23 lines (17 loc) · 1.02 KB

Awesome Git Tutorial.md

File metadata and controls

23 lines (17 loc) · 1.02 KB

git pull or git stash to merge local changes with remote server

git pull and overwrite the local changes OR protect the local changes

git merge bwtween branches and merge conflicts

How to resolve merge conflitchs

  • Follow the instructions for command line arguments for merging the pull request.