A
A
andrewnsk2017-09-09 13:05:50
Version control systems
andrewnsk, 2017-09-09 13:05:50

Unable to merge in Mercurial with kdiff3. How to solve the line end style problem?

When trying to merge (merge) the default branch and branch2 , a conflict appears. I choose to resolve the conflict with kdiff3. The message "Conflicts Left. There is a line end style conflict. Please choose the line end style manually. File not saved." Then "File Open Error. Opening of these files failed: -base; -parent2" pops up. Kdiif3 defines "Line end style: " for base and parent2 as unix, and for parent1 as DOS. Apparently there is a problem with this. I tried to install kdiif3 in the Editor in the settings, changed the line end style from autodetected to dos/windows. After that, when merging, when there is a conflict, choosing to resolve with kdiff. Kdiff allegedly automatically eliminates the conflict and writes that the conflict has been resolved, everything is ok. You can continue, but in fact nothing merges. TortoiseHg version 4.3.1 includes Mercurial-4.

Answer the question

In order to leave comments, you need to log in

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question