resolving-merge-conflicts

Inspect the current merge state and conflicting files, then trace each conflict to its source commits, PRs, or issues to understand intent. Resolve each hunk preserving both changes where possible, run the project's checks, then stage and commit to finish the merge.

During a rebase, resolve each conflicting hunk by understanding why both changes were made, then stage the files and continue the rebase. Repeat for every commit until the rebase completes, and run typecheck and tests to confirm nothing broke.

This workflow never aborts; it always resolves the conflict in place. Aborting discards progress, so instead investigate the conflicting changes' origins and resolve each hunk deliberately, noting trade-offs when intents are incompatible.

Run the project's automated checks, typically typecheck first, then tests, then formatting. Fix anything the merge broke before staging all files and committing to complete the merge or rebase.

This approach fits conflicts where both sides' intents can be discovered from history, commits, or PRs. If the conflicting changes lack any traceable context, you may need to consult the original authors directly before resolving.