Phil Beauvoir

There is an option to save the EMF Resource xml file with specific line endings. Because the xml files that JB committed have UNIX "LF" line endings I added this...

Alternatively, after each grafico export we could stage all files (Git "Add"). Staging files with these line ending diffs removes the line ending problem.

> I first though it was line-ending problems but this also happens in a windows only context Hmmm. Then I don't know.

I'm beginning to suspect that this can happen after a merge. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=499615

I've updated JGit to 4.11 and I still see this problem and it seems to happen after a merge. Changing line endings manually of the affected files to match that...

Setting autocrlf to "input" and writing all XML files with UNIX line endings seems to fix the problem. I've made it so that new repos will have this setting, but...

However, this change will affect existing users who either won't have the latest version or don't change their config files. The only way round this I can see is to...

I think there are a number of issues going on here. If everyone was using the same line endings (UNIX) that would help. That's taken care of. But might not...

@stigbd Try this https://github.com/archimatetool/archi-modelrepository-plugin/releases/tag/0.4.0_alpha

SmartGIt is the best