Answer the question
In order to leave comments, you need to log in
E
E
exper1ment2020-01-20 12:14:41
exper1ment, 2020-01-20 12:14:41
How to enable conflict help in Atom?
Installed GitHub Desktop, set Atom as the default editor for resolving merge conflicts. Problem: I don't see any help to resolve conflicts. the code is tagged: "<<<<<<< HEAD", "||||||| merged common ancestors", ">>>>>>>". I don't really want to fix it manually. How to include tools for decision-making in conflicts?
Similar questions
W
A
A
K
A
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question