Scene:Rebase the F-master branch to the F-1 branch

Steps:

1. Execute the following commands:

git rebase -i f-master

If there is no conflict, nothing is done.

2. If there is a conflict, go to IDEA to resolve the conflict and execute:

git add . git commit -m "xxx"

3. Thus, a commit record conflict is resolved. To perform:

git rebase --continue

4. Repeat steps 2 and 3 until all conflicts are resolved.