PDA

View Full Version : No arrow/marker in solving merging conflict in GIT



alfa_80
January 26th, 2012, 02:10 PM
I am currently having a merge conflict, normally I can just manually edit them. But now, my problem is the file is not showing any arrow/marker(>>>>, <<<<< & ====) in which I could be able to edit it.

The problem is that I perhaps have a lot of changes uncommited and also there is one newly-added file and one newly-created binary file.

How do I resolve this?