If you want to update your git feature branch with the new changes from the master branch, you need to:
- Update master branch
- Merge or rebase the new changes
TL;DR: merging creates additional commit, rebasing rewrites history. Usually the team chooses the way to handle conflicts in repository so ask your colleagues first what your team approach is.
git checkout master git pull git checkout target_feature_branch git merge master
git pull --rebase origin target_feature_branch fix conflict and then → git add . git rebase --continue git push -f