search

JMG1 / ExplodedAssembly

FreeCAD workbench to create exploded views and animations of assemblies
GNU Lesser General Public License v2.1
118 stars 27 forks source link

Conflict with `git sumodule foreach git pull origin master` #1

Open galou opened 8 years ago

galou commented 8 years ago

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 commented 7 years ago

@galou is this still an issue?

galou commented 7 years ago

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

JMG1 commented 7 years ago

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

galou commented 7 years ago

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

luzpaz commented 6 years ago

@galou this may be fixed after https://github.com/FreeCAD/FreeCAD-addons/issues/91 and once @yorikvanhavre completes https://github.com/FreeCAD/FreeCAD-addons/issues/90

luzpaz commented 5 years ago

@galou can you reproduce this anymore ?