Symptom

  • Branching relationship lost during the code migration
  • Not able to find the branch from “target Branch” drop down when doing a merge

Root Cause

  • In my case, it was due to the conflict resolving when doing a code migration

Solution

  1. Decide the correct relationship – Find it out from your old merging/changeset history
  2. Do a baseless command line merge – > tf merge /baseless <Parent Branch> <Child Branch>
  3. Check in the merged change – This will be the folder. Review it before you click OK (unless you did the /recursive option)
  4. Reparent them from the File->Source Control -> Merging & Branching – Only if they are both Branches
Advertisements