| Subject: Branching question |
| Group: microsoft.public.vstudio.general |
| Date: 8/6/2008 7:41:27 PM |
| From: "Julie" [Email Address Protection] |
Hi, I have two VS team system branches where i have the same file in each. I accidently checked-in a file to both branches, without merging. So now, when i make changes to one branch, i can't merge back to the other branch. Is there a way to fix the file in the branch to allow merging back to the other branch? Thank you very much in advance. PS. i know about the tf.exe's /baseless merge, but i'd like to fix this for good. |
| Back |