Resolving Conflicts
This function can be performed by users with Contributor role or higher.
When you open your change request you may receive a message that it is out of date with the latest changes in live. This happens when changes in another change request are approved and published after your change request was created. It doesn’t necessarily mean that the flows you are working on were affected by those approved changes.
Click Merge new changes from live.
The flows affected are listed on the left and you will see a side-by-side display of the old live (as it existed when the change request was started) and the current live version. Review the changes and click Merge into this change request.
You will be notified if the new live version conflicts with changes you’ve already made in your change request. Click the changes link in the message or click the Changes tab.
The flow(s) that are in conflict are listed on the left with a red exclamation mark, and you’ll see the live version on the left and your version on the right.
Take one of the following steps to resolve the conflict:
- If the new live reflects the same changes you were making, you can just click Discard change (accessed from the … button at the top right).
- If your change is small and would be easy to recreate, take a screenshot of your changes, click Discard change, then go to the Flows tab and make the changes again in the updated flow.
- If your changes are extensive, click Edit flow (from the … button) and copy everything to a new placeholder flow, discard the flow that is conflict, and then copy the placeholder flow back over the flow originally in conflict. Lastly, delete the placeholder flow if it's no longer needed.
Note Discard change only removes changes to the selected flow in conflict, not the entire change request. Changes you’ve made to other flows remain intact. Repeat this evaluation as required if additional flows are marked as in conflict.
To see this process in action, watch our video here: [link to new video coming soon].