Basic git operations and branch issues

Question

I would like to ask some basic questions about git. I have a project. The public part is placed in the master, and the customized functions are placed in the branch.
I usually modify the public part on the master. When updating, I hope that the branch can also be modified, but It just often conflicts when updating
My steps are: submit git add on master first.=>git commit -am 'xx'=>git push -u origin master
then updates the new content of the public part to the branch: git branch branch=>git pull=>git merge
Confict has already been reported during git pull. What should be the correct steps?

Answer 1

There will definitely be conflicts according to your process. You can only go to the both modified files to manually fix the conflicts, and then submit them again.

Answer 2

If you change a file on the master branch, and then you change the file on another branch, there will be a conflict when you merge.

Or resolve the conflict, git add, git rebase --continue;

Or merge branches every day, this way there will be a lot less conflicts