Using git-svn to merge a svn branch back into trunk and trunk back into the branch

前端 未结 5 875
北荒
北荒 2021-02-05 19:39

So I\'m using git and interacting with an svn repo.

I have a svn TRUNK that looks like this:

A-B-C-D

And a svn bug_fixes branch that br

5条回答
  •  醉梦人生
    2021-02-05 20:28

    If you dcommit a merge it automatically squashes it into 1 commit. Sadly it does not internally use svn:mergeinfo or --reintegrate as it should, so you lose the association with the branch created via 'git svn branch'.

提交回复
热议问题