Categories

JavaScriptPHPHTMLCssPythonWordPressWeb developmentLinuxMySQLAndroidWindowsJavaC++ / C#LayoutReactUbuntuYiiDjangoProgramming1C-BitrixLaravelSystem administrationTelegramJSONDebianPostgreSQLIOSGoogleHtaccessWindows ServerGitMacOSGoogle ChromeCMSWooСommerceBootstrapNginxSQLUnityAPI
Make a leaderReport
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
V
Vann Damm2020-04-20 16:15:40
Preventing me from creating a new git branch? 1Reply
M
Maxim Grechushnikov2015-10-06 16:29:58
Why does GIT hang? 3Reply
S
szQocks2021-06-16 01:11:04
Why is the .env file not pushed to git? 1Reply
D
Denis2011-04-25 17:16:41
Trouble installing git-commit-notifier 4Reply
L
leha782015-10-12 13:02:24
How to make it easier to work with Bitbucket (my use case inside)? 7Reply

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question