KDiff3: "There is a line end style conflict"

Question

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

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.

What you choose is about the result of Merge. Since a conflict occurs during Merge operation, first choosing a line ending and then running Merge practically resets your choice back to conflict. Run Merge, get a conflict, make your choice, and then save. — Guney Ozsan, Nov 25 '18 at 15:55

score 171 · Accepted Answer · edited Jun 12 '18 at 20:26

171

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

edited Jun 12 '18 at 20:26

Neuron

answered May 20 '16 at 16:20

Bill Tarbell

I found no need to do step 1. (kdiff3 Version 0.9.98 (64 bit)) – LosManos Jan 17 '19 at 08:26
Ant note that in the newer version that feature works better! in 1.9.5 it solves conflict automatically! – STG Apr 04 '22 at 11:36

score 52 · Answer 2 · edited Jun 12 '18 at 20:27

52

What worked for me:

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.

edited Jun 12 '18 at 20:27

Neuron

answered Mar 07 '15 at 06:43

matt wilkie

2 Answers2