ExplodedAssembly icon indicating copy to clipboard operation
ExplodedAssembly copied to clipboard
verified publisher icon JMG1

Conflict with `git sumodule foreach git pull origin master`

Open galou opened this issue 9 years ago • 6 comments

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?

galou avatar Aug 11 '16 10:08 galou

@galou is this still an issue?

luzpaz avatar Aug 15 '17 02:08 luzpaz

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

galou avatar Aug 22 '17 16:08 galou

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

JMG1 avatar Aug 23 '17 07:08 JMG1

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

galou avatar Aug 23 '17 21:08 galou

@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 avatar Sep 02 '18 14:09 luzpaz

@galou can you reproduce this anymore ?

luzpaz avatar Oct 10 '19 10:10 luzpaz