git变基与合并

Question

开发主分支master,
我需要做一个新的功能在master上建了一个新的分支A.开发周期比较长。
等A开发完之后，master分支已经经历过好几个版本的提交。
这时候我往master分支合并的时候：
是A分支直接合并到master过去？
还是把master分支拉到我的分支最新？
还是在A分支上变基？

求大神指点~ 谢谢。

Answer 1

Don’t touch the master, put the conflict resolution on branch A. The standard approach is to rebase master on your branch A, resolve the conflict and push it and then initiate a PR

Answer 2

Merge or rebase (if this branch has no other users) master on A. Then test it and merge it back to master after passing it.

Answer 3

It’s enough to just pull to master

Answer 4

git chekout A
git rebase origin/master
git checkout master
git rebase A

Conflicts are resolved on A and then merged into master