automatic conflict resolution of .gitmodules fails without common ancestor

forTEXT / catma

Computer Assisted Text Markup and Analysis

https://www.catma.de

GNU General Public License v3.0

88 stars 8 forks source link

automatic conflict resolution of .gitmodules fails without common ancestor #210

Closed mpetris closed 4 years ago

mpetris commented 4 years ago

if two users add resources to an empty project concurrently then there is no common ancestor of .gitmodules and the automatic conflict resolution, which expects a common ancestor, fails.