Is git svn compatible with git subtree?

时间秒杀一切 提交于 2019-11-30 13:11:46

I am currently using it. The only issue (or side effect) I noticed, is that if I dcommit into the svn the merge from the subtree is committed as one single commit (like squash); so you will loose the history of the subtree commits in the svn repo.

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.

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!