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
-
Good way to create Pull request or contribute to open source projects:
-
How to accept a Pull Request:
- Follow the instructions for command line arguments for merging the pull request.