tortoise svn always merging 45 extra files

前端 未结 4 1798
伪装坚强ぢ
伪装坚强ぢ 2020-12-29 07:36

When we do our branching and merging with svn, we always have the same thing happen.

We get a latest copy of the trunk.

Create a branch and switch.

4条回答
  •  情书的邮戳
    2020-12-29 08:34

    Personally, I think mergeinfo causes more problems than it solves, at least with the current state of the tooling. Once it's transparent on commits, maybe it will be worth using.

    You can safely delete mergeinfo properties. However, be aware that you will need to manually track which revisions to merge for re-integrations.

提交回复
热议问题