Answer: To resolve merge conflicts, enter the Copilot prompt /pr fix conflicts, which fetches the latest base branch, syncs your branch, resolves conflicts, and pushes the result. To choose a merge strategy, add the mergeStrategy setting to your configuration file, either in your user-level settings (typically ~/.copilot/settings.json) or in .github/copilot/settings.json in your repository root, setting it to "rebase" or "merge". Status: Confirmed Entry: tool/github-copilot/commands-and-shortcuts/resolve-merge-conflicts Revision: 2 Digest: sha256:9835cecda267b5f2 (changes whenever the content changes) Timeline: Created: 2026-11-13T03:24:46Z Last changed: 2026-11-17T13:19:54Z (conflict resolution command: — → /pr fix conflicts) Last verified: 2026-11-20T13:03:26Z Next check: 2026-11-21T13:03:26Z Check interval: Daily Expected change: No fixed schedule Data: Field | Value | Source | As of conflict resolution command | /pr fix conflicts | [1] | 2026-11-20 merge strategy setting | mergeStrategy | [1] | 2026-11-20 rebase option | "mergeStrategy": "rebase" | [1] | 2026-11-20 merge option | "mergeStrategy": "merge" | [1] | 2026-11-20 user settings file | ~/.copilot/settings.json | [1] | 2026-11-20 repository settings file | .github/copilot/settings.json | [1] | 2026-11-20 Sources: [1] GitHub. "Managing pull requests with the /pr command - GitHub Docs". https://docs.github.com/en/copilot/how-tos/copilot-cli/use-copilot-cli/manage-pull-requests Role: primary. Accessed: 2026-11-20T13:03:26Z Quote: "Copilot prompt /pr fix conflicts" (Supports: conflict resolution command) Quote: "add the mergeStrategy setting to your configuration file" (Supports: merge strategy setting) Quote: ""mergeStrategy": "rebase"" (Supports: rebase option) Quote: ""mergeStrategy": "merge"" (Supports: merge option) Quote: "typically ~/.copilot/settings.json" (Supports: user settings file) Quote: "Add the same setting to .github/copilot/settings.json in your repository root." (Supports: repository settings file) Snapshot SHA-256: 0bcabe11d857053ebd5b8ff3bfb5d0277bc8b1614d9c489d7e557210be4320a4 (captured 2026-11-18T12:57:47Z) Verification: Method: Automated extraction from [1] with deepseek-flash (JSON output, thinking disabled). Every value was checked by code to appear verbatim in a quoted passage of [1]. On this check the text of [1] was unchanged since 2026-11-18T12:57:49Z, so the values verified then were kept. Cross-check: not-available at 2026-11-20T13:03:26Z. No independent second source is configured for this entry Last successful check: 2026-11-20T13:03:26Z Last attempt: 2026-11-20T13:03:26Z Notes and limitations: Extracted automatically from a single official source (section "Resolving merge conflicts"). Related: https://latestn.com/tool/github-copilot/commands-and-shortcuts/resume-interactive-session How do I resume an interactive session in GitHub Copilot CLI? https://latestn.com/tool/github-copilot/commands-and-shortcuts/resume-previous-session How do I resume a previous GitHub Copilot CLI session? https://latestn.com/tool/github-copilot/commands-and-shortcuts/rollback-double-esc How do I roll back changes in GitHub Copilot CLI using a double Esc keypress? https://latestn.com/tool/github-copilot/commands-and-shortcuts/open-close-sessions-sidebar How do I open and close the sessions sidebar in GitHub Copilot CLI? https://latestn.com/tool/github-copilot/commands-and-shortcuts/plan-command-implementation How do I draft an implementation plan with /plan in GitHub Copilot? https://latestn.com/tool/github-copilot/commands-and-shortcuts/queue-prompt How do I queue a prompt for GitHub Copilot CLI to process next? https://latestn.com/tool/ All entries in AI tools Change log: Time | Event | Change | Source 2026-11-17T13:19:54Z | changed | conflict resolution command: — → /pr fix conflicts | [1] 2026-11-17T13:19:54Z | changed | resolve conflicts command: /pr fix conflicts → — | [1] 2026-11-13T03:24:46Z | added | Entry created | — Changes for this entry as a feed: https://latestn.com/tool/github-copilot/commands-and-shortcuts/resolve-merge-conflicts/latest Challenge this entry: Open challenges: None How: If a value here is wrong or out of date, send what is wrong and a link to evidence. Challenges are queued and checked against the evidence; they do not change the entry by themselves. If the entry changes as a result, the change log says so. Form: https://latestn.com/dispute/tool/github-copilot/commands-and-shortcuts/resolve-merge-conflicts POST: https://latestn.com/dispute/tool/github-copilot/commands-and-shortcuts/resolve-merge-conflicts with claim, evidence_url, and optionally field and contact (form-encoded or JSON) GET: https://latestn.com/dispute/tool/github-copilot/commands-and-shortcuts/resolve-merge-conflicts?claim={what is wrong}&evidence_url={link} How to cite: LatestN. (2026). How do I resolve merge conflicts with the GitHub Copilot CLI /pr command and choose a merge strategy? Revision 2, last verified 2026-11-20T13:03:26Z. https://latestn.com/tool/github-copilot/commands-and-shortcuts/resolve-merge-conflicts (accessed 2026-11-21T10:02:22Z). @misc{LatestN_tool_github_copilot_commands_and_shortcuts_resolve_merge_conflicts_r2, title = {How do I resolve merge conflicts with the GitHub Copilot CLI /pr command and choose a merge strategy?}, author = {{LatestN}}, year = {2026}, howpublished = {\url{https://latestn.com/tool/github-copilot/commands-and-shortcuts/resolve-merge-conflicts}}, note = {Revision 2; digest sha256:9835cecda267b5f2; last verified 2026-11-20T13:03:26Z; accessed 2026-11-21T10:02:22Z} } Reuse: License: CC BY 4.0 (https://creativecommons.org/licenses/by/4.0/) Attribution: Copying and adapting are allowed, including commercially, if you credit LatestN and link to the entry you used. Each entry ends with a ready-made citation. URL: https://latestn.com/tool/github-copilot/commands-and-shortcuts/resolve-merge-conflicts