Sublime Merge Version: 2095
Operating System: NAME=“Ubuntu” VERSION=“18.04.6 LTS (Bionic Beaver)”
Steps to Reproduce:
- While doing cherry pick a rivision to a Release branch, one file full conflit showing, while checking this file comes to know that Line ending issue on that file.
- [Include any relevant git commands or operations], Here in Preferences.sublime-settings following setting done.
“ignore_diff_white_space”: true,
“visible_carriage_returns_at_eol”: false,
“default_line_ending”: “unix”,
Expected Behavior:
In the rivision modified line only changes expecting in this file.
Actual Behavior:
Full File Conflict showing while taking through Resolve Conflit in Sublime Merge. Each line in the file showing ‘<0x0d>’