Adds conflict resolution actions to rebase editor conflict list

[ianhattendorf]

Summary

• Adds per-file Take Current, Take Incoming, and Stage actions to each conflicted file in the rebase editor's conflict panel, plus panel-header Take All Current / Take All Incoming actions (with modal confirmation) for bulk resolution
• Wraps git checkout --ours|--theirs -- <path> as a new checkoutConflictedPath operation on the git provider, filters actions to those valid for each conflict status, and warns before staging a file that still contains conflict markers
• Fixes misleading conflict status labels by decoding Git's unmerged two-char status codes explicitly — UA / AU now read as Added by Incoming / Added by Current instead of mixing in a bogus Modified side, while UD / DU keep their correct modified/deleted wording

Closes #5127

Test plan

• Start a rebase that produces conflicts with a mix of statuses (UU, UA, AU, UD, DU, AA, DD)
• In the rebase editor conflict panel, verify each file shows only the actions valid for its status
• Use Take Current / Take Incoming / Stage per-file and confirm the working tree + index update correctly
• Use the header Take All Current / Take All Incoming and verify the confirmation modal + bulk resolution
• Stage a file that still contains conflict markers and confirm the warning prompt appears
• Verify conflict status labels read correctly for UA / AU / UD / DU

[augmentcode]

🤖 Augment PR Summary

Summary: This PR enhances the Rebase Editor’s conflict panel by adding per-file and bulk conflict-resolution actions.

Changes:

• Adds per-conflict-file actions: Take Current, Take Incoming, and Stage, plus panel-header bulk actions for taking one side across all conflicts (with confirmation).
• Introduces a new git operation wrapper for resolving unmerged paths via git checkout --ours|--theirs -- <path(s)...>, including batching to respect CLI length limits.
• Refactors/centralizes decoding of Git’s two-character unmerged status codes and updates labels/descriptions (notably fixing UA/AU wording).
• Adds utilities and unit tests for conflict status labeling/action availability and for mapping conflict statuses to concrete resolution actions (take ours/theirs/delete/unsupported).
• Adds telemetry events for resolving a single conflict, staging a conflict, and resolving all conflicts in bulk.

Technical Notes: Bulk resolution classifies each conflicted file into checkout/delete operations, stages successful results, and logs/report failures; staging warns if conflict markers are still present.

_{🤖 Was this summary useful? React with 👍 or 👎}

[augmentcode]

Review completed. 4 suggestions posted.

Comment augment review to trigger a new review at any time.

[gitkraken-services]

🟢 Conflict resolved with 100% confidence

Comment gitkraken apply to apply this conflict resolution.

---

Resolution details

🟢 package.json (merged, 100%)

Merged the new rebase conflict resolution commands from 'theirs' into the 'ours' version of package.json. The 'ours' side had removed some remote provider commands in this section which were present in 'theirs', so I preserved the 'theirs' additions (rebase commands) while maintaining the 'ours' state for the surrounding remote provider commands.

🟢 packages/git-cli/src/providers/operations.ts (merged, 100%)

Merged imports from '../exec/git.js' by combining additions from both sides. 'ours' added signing-related utilities (classifySigningError, inferSigningFormatFromError) and formatted the import as a multi-line block, while 'theirs' added 'maxGitCliLength'.

🟢 src/webviews/apps/rebase/rebase.ts (merged, 100%)

Merged changes from both sides: adopted the new percentage-based split panel constants from 'ours', integrated the new 'Stage All' buttons and layout toggle improvements from 'theirs', and used the shared conflict rendering utilities introduced in 'ours' while ensuring compatibility with the logic updates in 'theirs'.

---

Generated by GitKraken at 2026-05-04 23:36:51 UTC

[eamodio]

@ianhattendorf this is ready to go once the conflicts are resolved right?

[ianhattendorf]

@ianhattendorf this is ready to go once the conflicts are resolved right?

Yes, I'll rebase and merge today.

[ianhattendorf]

@d13 FYI: de6d261 if you want to double check this (see: https://github.com/gitkraken/vscode-gitlens/actions/runs/25352599134/job/74335251799)