0

After I got message about existing conflicts, I found that files with conflicts contain marks like

<<<<<<<<<<<<<<<

or 

>>>>>>>>>>>>>>>

Is this correct? What is the name of this file format?

Dims
  • 47,675
  • 117
  • 331
  • 600
  • 2
    Those marks indicate conflicting areas. Git displays how your code looks on both branches your are trying to merge. You have to resolve those conflicts in order to be able to merge. – Vadim Sirbu Feb 20 '20 at 09:38
  • Ya, I understand this. But I wish to open this file in some GUI tool and hence wish to know beforehead, it is supports it. – Dims Feb 20 '20 at 09:44
  • I personally use `git mergetool` to resolve conflicts. You can specify which tool to use, like meld: `git mergetool --tool=meld` – Vadim Sirbu Feb 20 '20 at 09:54
  • @VadimSirbu does `meld` read this file? how would you know, that `meld` tool can understand such a file? how to ask, if `Clion` can understand such a file? – Dims Feb 20 '20 at 11:55
  • Use `emacs`. It has good mode for Git. – 0andriy Feb 20 '20 at 13:30

1 Answers1

0

Conflict marks <<<<, ==== and >>>> could be a result of a conflict in many git commands: rebase, merge, cherry-pick, apply. The result is still a text file and you can open it in any text editor. E.g, I usually use vim instead of mergetool.

phd
  • 82,685
  • 13
  • 120
  • 165