đĄ The guidance in this article applies to both releases and release candidates. Use the Releases tab in the final environment or the Release candidates tab in the nominated penultimate environment.
Resolve a merge conflict
When multiple features are combined into a release or release candidate, they may conflict with each other or with the packageâs branch. Gearset attempts to merge as many features as possible automatically and identifies any features that still require conflict resolution.
If Gearset canât merge a feature automatically:
Open the release or release candidate.
Find the feature marked as having a merge conflict.
Select Resolve.
Review each conflict and choose the change you want to keep.
Complete the conflict resolution.
If a previous conflict resolution is available and the functionality is enabled, Gearset keeps that resolution selected for you to review.
Merge the resolved feature
Resolving the conflict doesnât automatically add the feature to the package. After completing the resolution:
Return to the appropriate pipeline environment.
Open Releases or Release candidates.
Select the correct release from the dropdown.
Open its list of features.
Select Merge for the resolved feature.
Gearset adds the feature to the package and validates the combined changes again.
Add a dependent feature with a conflict
A feature may conflict with the target environmentâs base branch but still be required because it depends on another feature already included in the release or release candidate.
In this situation, the feature might not be available to merge or add from Open pull requests. Instead:
Open the relevant release or release candidate.
Choose the option to add features.
Select the dependent feature.
Resolve any conflicts and merge it into the package.
Adding the feature from the package allows Gearset to evaluate it alongside the changes already included in the release or release candidate.