When resolving conflicts for a PR within Gearset, the system will now store a 'fingerprint' of each conflict and what resolution was selected.

As you then move this PR down the pipeline, the system will look at any stored conflict resolutions that have happened on earlier environments and will suggest resolutions for matching conflicts.

The matching conflicts found will be auto-selected in the conflict UI - you will have the opportunity to review these suggestions and (if required) change them prior to committing the resolution.

I've worked on a new feature that contains some Apex code. This has resulted in a conflict against my Staging static environment.

I'll use Gearset's conflict resolution tooling and decided how best to resolve these conflicts.

I've resolved my changes and I've promoted them to my next static environment, Production. This has been successful but the changes in my feature conflict with my Production static environment.

Gearset knows that the conflicts are the same as what happened against my Staging static environment, so it will show me a banner and it'll automatically choose the selections I made before:

I can scroll through the file and check that I'm happy with these suggestions. If I am, I can go ahead and select Mark as resolved and Commit merge.

The suggested changes might not be be how you want to resolve your conflicts. You still have full control over which choices you make for each conflict. This means you can select something else instead.

On the top banner you can disable Accept previous resolution conflicts and the suggested selections will be deselected:

Alternatively, you might only want to change one of the resolution choices. You can change any of your selections in conflict resolution tool.

Note: if you decide on different conflict resolutions for your final environment (which should align to the base branch for your pipeline) compared to prior environments, and then proceed to sync those branches as part of pipeline maintenance, you may find changes appear to merge and deploy.

The toggle will be switched off to show you've selected something other than the suggestion resolutions but everything else remains checked.

Your new selections will also be saved and if we see this range of conflicts again, we'll take your most recent suggestions.

If you can't see any suggested resolutions, it means your feature or the environment has sufficiently changed so we don't think the suggestions will be accurate anymore.

We've adopted a conservative approach to ensure our suggestions are relevant.