Is git svn compatible with git subtree?

后端 未结 2 461
自闭症患者
自闭症患者 2021-01-02 06:13

Now that git subtree has been merged into the core git distribution (its also on Msysgit as of 1.8.0), does anyone know if git svn works with git subtree?

Note: I am

2条回答
  •  别那么骄傲
    2021-01-02 07:07

    There is can be a possibility to accidentally mix subtrees together (make an intersection part that can exist both in a parent and in a child subtrees, or in repository root and in a repository subtree). In that case git may throw strange pull errors like ! [rejected] or merge conflicts at auto-merging.

    A search for real source of the issue through the mess of conflicts like these can be a real pain.

提交回复
热议问题