git - Conflict occurs when hoxfix branch merges back to develop branch

Question

As shown above, we work on two branches: master and develop, among which the master branch is used to release stable versions.
Then I suddenly found a bug in version 1.2 that needed to be fixed urgently.
So I created a new branch hotfix and modified the code on it.
has been modified. Of course, I hope to merge the hotfix branch back to both the master and the develop branch.
However, when merging into master Everything is normal, but when merging into the develop branch, a conflict is displayed. It seems that the develop branch is ahead of master, and hoxfix is pulled from version 1.2 of master.

Please tell me the correct way to use hotfix. .

Answer 1

Yes, it’s okay if conflicts arise, just resolve them.

Answer 2

The correct way to use it is to resolve conflicts when there are conflicts

Answer 3

If master is normal, don’t worry about it. Just resolve the conflict on dev

Answer 4

develop and hotfix modified a file at the same time