Use idea to merge git branches

For example, now I want to merge the feat_debug branch into the dev branch

Then
first update both branches.

Then checkout to the dev branch,

Select feat_debug in local Branches
and click merge into current.

If there is a conflict, handle it manually.

》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》

Guess you like

Origin blog.csdn.net/qq_42852943/article/details/126742006