TFS 2010 Branch Across Team Projects - Best Practices

前端 未结 5 1705
再見小時候
再見小時候 2020-12-01 05:24

I\'m having issues understanding how to configure TFS according to best practices as provided by the TFS Ranger team. The issue is such:

My company has several produ

5条回答
  •  悲&欢浪女
    2020-12-01 05:54

    I've been configuring TFS just now and met with the same problem. The point is, there's no need in baseless merge. Workaround:

    1. Create parent branch

      $/Core/Main

    2. Create child branch

      $/Product1
      -> /Main
      -> /Main/Core
      -> /Main/...

    3. Delete child branch folder

      $/Product1/Main/Core

    4. Create folder with the SAME name

      $/Product1/Main/Core

    5. Convert Product1 folder to branch

      $/Product1/Main

    Now you can merge changes from $/Core/Main to $/Product1/Main/Core and backwards.
    Visualization won't work for Core branch, but it's okay I guess ;)

提交回复
热议问题