KDiff3: "There is a line end style conflict"

Kdiff3

Kdiff3 Problem Overview


I am trying to use KDiff3 to solve conflicts on windows. But when run the merge I get:

KDiff3: "There is a line end style conflict"

And nothing is merged/solved:

first screenshot

Even though I selected DOS line ending before running the merge:

second screenshot

Any ideas?

It seems to work if I just save instead of pressing the Merge button. That could be a solution.

Kdiff3 Solutions


Solution 1 - Kdiff3

Here's a screenshot to walk you through the process that Matt Wilkie described in his answer.

  1. Click in the C pane.
  2. Choose an encoding other than 'conflict'
  3. Save

enter image description here

Solution 2 - Kdiff3

What worked for me:

  • make the output pane active (click in it),
  • manually choose both Encoding and Line end style drop down choices,
  • save (Ctrl + S).

Without doing all three steps, I just kept getting the same error popup. Choosing Use A everwhere and/or related merge menu items had no effect.

Attributions

All content for this solution is sourced from the original question on Stackoverflow.

The content on this page is licensed under the Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) license.

Content TypeOriginal AuthorOriginal Content on Stackoverflow
Questionu123View Question on Stackoverflow
Solution 1 - Kdiff3Bill TarbellView Answer on Stackoverflow
Solution 2 - Kdiff3matt wilkieView Answer on Stackoverflow