Why am I not able to discard changes sets
we are using 4.0.5 I have a developer that tried to discard change sets from his workspace. He received the error
Problems occurred running discarding change sets
Reason error while discarding change set
Would create fork/conflict for /build.xml
He actually got frustrated and just deleted the workspace but is extremely unhappy with that as a resolution.
Any ideas
Problems occurred running discarding change sets
Reason error while discarding change set
Would create fork/conflict for /build.xml
He actually got frustrated and just deleted the workspace but is extremely unhappy with that as a resolution.
Any ideas
Accepted answer
This is a pet peeve of mine. The fact that it would result in a conflict should not block you from discarding a change set. This issue was first reported in work item discard cannot introduce conflicts (2198) (Jan 2006 :-), and several other work items since then. Probably the best work item to add your support to would be Allow discarding a change-set when that produces a simple (2-way) merge conflict (20814). Until that restriction is removed, what you have to do is to ask RTC for the history of the file with the conflict, suspend the merge change set and all of the change sets on one side of the merge, and then accept the change sets on the other side of the merge.