git rebase and merge

Question

Develop the main branchmaster,
I need to make a new function and built a new branchmaster on A. 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 merged to the master branch: Did
branch A directly merge into master?
Or pull the master branch to my latest branch?
or rebase on A branch?

Please give me some advice~ Thank you.

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