I get this message when opening a file. Updating to latest version did not help. Github desktop acted weird before.
Opening in TextMate doesn’t help (at least me) either.
Help. please!
This is a Git merge conflict (the line with the “<<<<<…”). You can send me the file and I’ll store the original as far as possible. Otherwise, you can detangle the merge conflict manually (there are tutorials online for dealing with Git merge conflicts in a text editor).
1 Like
Thank you, file sent.
Fixed in private message.