Receiving fork/conflict error trying to discard the file
A developer accepted a change that broke his build. We created a new change set and tried moving the file causing conflict to the new changeset, we could not move it. We tried discarding the file and we received an error that it cant discard due to a fork/conflict error. How can we fix this.
|
2 answers
Geoffrey Clemm (30.1k●3●30●35)
| answered Mar 11 '15, 3:18 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
You can use the "Reverse" operation on that change set. That will produce a patch you can accept into your workspace. If there are any changes that you want to "keep" from the original change set, just discard the part of the patch that undoes that change.,
I assume when you say "tried discarding the file", you meant "tried discarding the change set containing the change to the file"? You can use that approach, but you would have to identify the change sets that depend on that change set, discard them as well, and then reaccept the ones you want to keep, and then "replace" the configuration of the stream with the configuration in your workspace, and then warn other team members to discard outgoing change sets that they did not create ... So I do not recommend that approach for your case. Comments Developer reversed the change set, but on the pending patch there is no option to accept the change, it only has remove from view, auto resolve, and resolve with proposed. When you click on the file it states there are no changes to the file. When he auto resolve yesterday it created another duplicate of the same file within its own outgoing set, so yesterday there were 3 of the same file. He was able to discard one, but that left 2 in outgoing with the pending patch.
Geoffrey Clemm
commented Mar 12 '15, 7:48 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER
Yes, "auto-resolve" is the way to get the patch into your workspace (not the most intuitive command name, but I'm sure they had their reasons for naming it that :-).
|
Hi Nanette,
Here is an article about conflict resolution with Jazz SCM:
https://jazz.net/library/article/39
Some more information in the info center with a few options:
https://jazz.net/help-dev/clm/index.jsp?re=1&topic=/com.ibm.team.scm.doc/topics/t_scm_conflict_content.html&scope=null
Hope this helps.
|