scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-09-12 23:01:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
Roo-Code/.roo/commands/roo-resolve-conflicts.md
roomote[bot] 5507f5ab64
feat: extract translation and merge resolver modes into reusable skills (#11215) 
* feat: extract translation and merge resolver modes into reusable skills

- Add roo-translation skill with comprehensive i18n guidelines
- Add roo-conflict-resolution skill for intelligent merge conflict resolution
- Add /roo-translate slash command as shortcut for translation skill
- Add /roo-resolve-conflicts slash command as shortcut for conflict resolution skill

The existing translate and merge-resolver modes are preserved. These new skills
and commands provide reusable access to the same functionality.

Closes CLO-722

* feat: add guidances directory with translator guidance file

- Add .roo/guidances/roo-translator.md for brand voice, tone, and word choice guidance
- Update roo-translation skill to reference the guidance file

The guidance file serves as a placeholder for translation style guidelines
that will be interpolated at runtime.

* fix: rename guidances directory to guidance (singular)

* fix: remove language-specific section from translator guidance

The guidance file should focus on brand voice, tone, and word choice only.

* fix: remove language-specific guidelines section from skill file

* Update .roo/skills/roo-translation/SKILL.md

Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com>

---------

Co-authored-by: Roo Code <roomote@roocode.com>
Co-authored-by: Bruno Bergher <bruno@roocode.com>
Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com>
2026-02-13 09:28:20 -08:00

1.9 KiB
Raw Permalink Blame History

description argument-hint mode
Resolve merge conflicts intelligently using git history analysis #PR-number merge-resolver

Resolve merge conflicts for a specific pull request by analyzing git history, commit messages, and code changes to make intelligent resolution decisions.

Quick Start

  1. Provide a PR number (e.g., #123 or just 123)

  2. The workflow will automatically:

    • Fetch PR information (title, description, branches)
    • Checkout the PR branch
    • Rebase onto the target branch to reveal conflicts
    • Analyze and resolve conflicts using git history

Workflow Steps

1. Initialize PR Resolution

# Fetch PR info
gh pr view [PR_NUMBER] --json title,body,headRefName,baseRefName

# Checkout and rebase
gh pr checkout [PR_NUMBER] --force
git fetch origin main
GIT_EDITOR=true git rebase origin/main

2. Identify Conflicts

git status --porcelain | grep "^UU"

3. Analyze Each Conflict

For each conflicted file:

  • Read the conflict markers
  • Run git blame on conflicting sections
  • Fetch commit messages for context
  • Determine the intent behind each change

4. Apply Resolution Strategy

Based on the analysis:

  • Bugfixes generally take precedence over features
  • Recent changes are often more relevant (unless older is a security fix)
  • Combine non-conflicting changes when possible
  • Preserve test updates alongside code changes

5. Complete Resolution

git add [resolved-files]
GIT_EDITOR=true git rebase --continue

Key Guidelines

  • Always escape conflict markers with \ when using apply_diff
  • Document resolution decisions in the summary
  • Verify no syntax errors after resolution
  • Preserve valuable changes from both sides when possible

Examples

  • /roo-resolve-conflicts #123 - Resolve conflicts for PR #123
  • /roo-resolve-conflicts 456 - Resolve conflicts for PR #456