git rebase and merge

Question

To develop the main branch master, I need to create a new function and build a new branch A on master. The development cycle is relatively long. After A is developed, the master branch has gone through several versions of submissions. At this time, when I merge to the master branch: Is branch A directly merged into master? return...

淡淡烟草味 · Answer

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

PHP中文网 · Answer

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.

PHP中文网 · Answer

It’s enough to just pull to master

漂亮男人 · Answer

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

Conflicts are resolved on A and then merged into master