Git rebase 我必须在 rebase 后拉

Question

I have 2 branches

master: mainfile, file1

feature-branch: mainfile, file2

Then I do:

git fetch

next

git checkout feature-branch

next

git rebase -i master

Then I squash all commits from feature-branch and resolve conflicts in mainfile. After this I have on feature-branch

mainfile, file1, file2

and then I have to git pull . After pull I have to resolve all conflicts from master for all commits in file1.

Why I have to pull and resolve conflicts in second rebase if after first rebase i have all changes from master in feature-branch and before rebase all my branches are up to date?

Answer 1

OK, I had wrong config. When I changed git config pull.rebase true to git config pull.rebase false it works now.