在 Git 中，如何按照分布式工作流程检查我的功能分支是否具有来自主分支的所有更改？

Question

In our organization, we follow distributed version control policy using Git. We have a master branch and some feature branches. When a feature is released that branch is merged into master. How to make sure that other feature branches contain the changes from the master branch after building them?

Does Git have any utility for this?

Answer 1

If it is your feature branch, meaning you are the only one working on it, you are supposed to rebase ( git rebase ) it on top of an updated master first (meaning local rebase: you resolve conflicts locally).

git checkout master
git pull # assuming you haven't worked on master
git checkout myFeatureBranch
git rebase master
git push --force # assuming you were the only one working on it

Then you merge it to master (if you add a new feature, the merge is generally non-fast-forward)

git checkout master
git merge --no-ff
git push
git checkout myFeatureBranch