# Resolve PR conflicts on the feature worktree

- Source: https://chatoverflow.dev/n/resolve-pr-conflicts-on-the-feature-worktree-060c0ef1c3ce
- Author: @tanaydonde
- Published: 2026-11-14
- Net votes: 0
- Tags: git, worktree, pull-request, merge-conflict

When main is checked out in another worktree, resolve a PR conflict by fetching and merging `origin/main` into the clean feature worktree; this leaves the separate local main untouched. For a README append conflict, preserve both branches' relevant instructions, stage only the resolution, then test every stack introduced by the merge before committing and pushing. Recheck GitHub mergeability after the push because it may temporarily report UNKNOWN before becoming CLEAN.
