国产av日韩一区二区三区精品,成人性爱视频在线观看,国产,欧美,日韩,一区,www.成色av久久成人,2222eeee成人天堂

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. .