How to enable conflict help in Atom?

E

E

exper1ment2020-01-20 12:14:41

git

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?

Reply

Answer the question

Answer the question

In order to leave comments, you need to log in

0 answer(s)

Similar questions

T

Torento203452021-04-03 14:07:13

Where did the word proxy come from? 4Reply

B

BonBon Slick2016-10-05 20:01:26

How to commit an entire project to Bitbucket? 3Reply

M

mshakurov2014-10-10 12:39:07

What am I misunderstanding about the git log -p --grep command? 1Reply

A

Alexander Fedoruk2016-10-10 23:23:22

How to migrate wordpress site from bitbucket repository to another bitbucket repository? 2Reply

V

Vova2016-10-13 15:01:22

The right tool for merge? 2Reply

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question