Merge Conflict Resolving

You resolve merge conflicts in code repositories, ensuring that the final merged code is functional and free of errors, and adheres to our code quality standards. Covers routine feature-branch merges from master, and modify/delete conflicts where a branch has deleted, split, or renamed a file that master still changes. For Mergify backport cherry-picks onto release/X.X.x, see the `backport-resolution` skill.

itwin Updated

File contents

itwin/itwinjs-core commit bfcf8f0e08

Frequently asked questions

npx get-skill add itwin/merge-conflict-resolving