Why am I getting conflicts after I replace a baseline with an earlier baseline?
vinay kumar nukala (42●3●67●72)
| asked Jul 19 '13, 2:13 a.m.
converted to question Jul 19 '13, 7:58 p.m. by Geoffrey Clemm (30.1k●3●30●35)
I am working on the C++ project Using Visual Studio 2008. Now I have a component with 3 Baselines in it.
1. I have right clicked on the component and selected Replace with baseline and loaded Second baseline successfully. And in Pending changes it is showing accept baseline 3. 2. Now i have created a new c++ file after loading the second baseline. It is asking me to accept the 3 baseline first. And to check in the new changes. 3. Some conflicts are happening as below. Without Accepting the third baseline changes(.vcproj file), it is not allowing me to check in, then what is the use in loading the second baseline. Please help on this issue. |
One answer
Geoffrey Clemm (30.1k●3●30●35)
| answered Jul 19 '13, 8:13 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER edited Jul 19 '13, 8:13 p.m.
When you backed your workspace up to baseline two, you no longer have the most recent change to rtc_demo.vcproj in your workspace, which is why it is now showing as an incoming change (baseline 3 contains the change set with this latest change to rtc_demo.vcproj). When you made additional changes in your workspace, one of the files you changed was rtc_demo.vcproj. This means that you have effectively branched rtc_demo.vcproj ... which means that you cannot deliver your branched version of rtc_demo.vcproj into the stream until you have merged the changes to rtc_demo.vcproj that you made in your workspace with the latest changes that are in the stream. That is why RTC is telling you that you have to first accept the latest changes from the stream before you can deliver your changes. Now that you have accepted the changes, you have to resolve the conflicts (i.e. the conflicts that RTC is showing you with the double-sided orange arrow). Once you have merged that conflict, you will be able to deliver.
Note: To give you more guidance, you'll have to explain why you were backing up to baseline 2 in your workspace. Were you trying to "undo" the change that was in baseline 3? In order to do that, you would either need to do a "replace" on the component in the stream to back it up to baseline 2 (backing up your workspace isn't the way to back up the stream), or keep baseline 3 in your workspace, and use the "reverse" operation to create a patch that effectively undoes the change in baseline 3. |
Your answer
Dashboards and work items are no longer publicly available, so some links may be invalid. We now provide similar information through other means. Learn more here.
Comments
Note: I've moved this from out from https://jazz.net/forum/questions/119664. Please remember to post new questions as their own question (with an appropriate title), and not as comments in a previous question.