Best practice to handle Accepting Changeset without affecting the Local Changes
Hello Team,
Generally, If we get any Incoming Changes will accept it and the incoming files will merge with the Local changes and the local files will modify. In other words, Incoming files will come with the conflicts in same file/line. We have to accept the incoming changes and we have to modify to local changes. Is there any best practice to handle Incoming changes and How to handle the Accepting Changeset without affecting the Local Changes.
Regards,
Kiran
|
One answer
Geoffrey Clemm (30.1k●3●30●35)
| answered Jul 15 '18, 11:25 p.m.
FORUM ADMINISTRATOR / FORUM MODERATOR / JAZZ DEVELOPER Make sure before you do an Accept that you checkin all your local changes, and complete all those change sets, to ensure that any merges that are performed are placed in separate change sets. Then you can easily discard those merge change sets, if you want to revert back to the local changes.
If you did checkin, but neglected to complete the change sets before accepting, the state of the local changes will still exist in the change set details, so you can still obtain a copy.
|
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.