CI job merger conflicts
When resolving CI job merge conflicts, a user has two windows to accept changes from one side of the window. Can we have an option to accept specific components changes from one side and certain changes from the other side.
Nhlanhla May
shared this idea
-
John
commented
This is important for Flows. I recently ran into an issue where I was doing development on a flow in a sandbox.
A teammate was doing work in a separate sandbox to the same flow. They pushed their changes to production. We then attempted to back-propogate those changes back into all other sandboxes to keep our Sandboxes in sync as best practice.
The changes I was making in my sandbox was to an assignment node. My teammate made a completely different change to the same assignment node. Gearset identified the two changes as a conflict because both variable additions appear on the same lines in the XML of the flow. WHen in fact these are not conflicts but valid changes. When resolving these conflict I'd like to be able to select both, since both changes are valid and I want the change made in Prod to also be in my sandbox so I don't encounter a regression