[Flightgear-devel] error: Entry 'Aircraft/Jaguar/Models/jaguar.xml' not uptodate. Cannot merge.

Hi all, currently my GIT fails to merge with the error message in the subject. I suspect this is a line-ending conflict. I did not touch the file locally. I tried git checkout -- Aircraft/Jaguar/Models/jaguar.xml git checkout --ours Aircraft/Jaguar/Models/jaguar.xml git checkout --theirs

Re: [Flightgear-devel] error: Entry 'Aircraft/Jaguar/Models/jaguar.xml' not uptodate. Cannot merge.

Hi Torsten, - Torsten Dreyer a écrit : Hi all, currently my GIT fails to merge with the error message in the subject. I suspect this is a line-ending conflict. I did not touch the file locally. I tried git checkout -- Aircraft/Jaguar/Models/jaguar.xml git checkout --ours