Sublime Forum

Sublime merge can't recognize the conflict correctly


Sublime merge can’t recognize the conflict correctly. It recognize all the file as the conflict, but actually, only a part of the file is the conflict.

Example showed as the following figure:



line ending changed?

1 Like


The conflict of the file is like that:

But, when I click the resolve button, Sublime Merge will recognize all the file is the conflict.



I’m pretty sure the file was added in both branches & since there is no baseline, Sublime Merge can’t put anything in the middle. Either that or what jfcherng said where the line ending differ between the two & the entire file is identified as a single conflict.

see for other ideas/info: