As shown in figure, the merge tool cannot use grey, baidu's method can reach the effect, and the problem is too little,
Hope to have in-depth study of the great god, refers to the way,

CodePudding user response:

The second floor for yourself, online, etc., in a hurry

CodePudding user response:

How to solve? I also met, worried

CodePudding user response:

N the find for a long time have no solution

CodePudding user response:

The merge tool normal development is useless, only in the merge (merger) code, the code if there is a conflict, the merge conflict resolution back into the state, this time the merge tool can be used

CodePudding user response:

Should be selected to conflicting files right rather than the right project name, project name right is gray, not with state