Conflict with git sumodule foreach git pull origin master

[galou]

I have a conflict when using https://github.com/FreeCAD/FreeCAD-addons and the command git sumodule foreach git pull origin master (each time I run the command).

The command output the last time I had the conflict is

From https://github.com/JMG1/ExplodedAssembly
 * branch            master     -> FETCH_HEAD
Auto-merging LICENSE
CONFLICT (add/add): Merge conflict in LICENSE
Auto-merging InitGui.py
CONFLICT (add/add): Merge conflict in InitGui.py

I don't know if this comes from your repository or FreeCAD-addons. Can you please have a look at it?

[luzpaz]

@galou is this still an issue?

[galou]

Unfortunately it is. Submodules are not easy to handle correctly.

[JMG1]

Well, the thing is that I have no idea about how to solve this. What should I do?

[galou]

I'm sorry but I also have no clue how to solve this. Were you actually able to reproduce the issue?

[luzpaz]

@galou this may be fixed after
FreeCAD/FreeCAD-addons#91
and once @yorikvanhavre completes FreeCAD/FreeCAD-addons#90

[luzpaz]

@galou can you reproduce this anymore ?