
- Check out your development branch
git checkout my_branch
- Update your development branch my pulling commits from origin/master
2a. method 1
git pull origin master
ab. method 2 ``` git fetch origin master git merge FETCH_HEAD
- Resolving conflcits.
git status
If it shows some files contain conflicts, manually edit the files and resolve the conflict blocks.
git add the files edited. git add my_file_1 ...
git commit git push
(END)