Skip to content

Commit 6d5cbb6

Browse files
committed
fix: update usage description and streamline commands for detecting merge conflicts
1 parent ce4234d commit 6d5cbb6

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

.roo/rules-pr-fixer/3_common_patterns.xml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,12 @@
2525
</template>
2626
</pattern>
2727
<pattern name="detecting_conflicts">
28-
<usage>Commands to detect merge conflicts without interactive operations.</usage>
28+
<usage>Commands to detect merge conflicts.</usage>
2929
<template>
30-
<command tool="git">git checkout main</command>
31-
<command tool="git">git pull origin main</command>
32-
<command tool="git">git checkout <pr_branch></command>
33-
<command tool="git">git merge-base main HEAD</command>
34-
<command tool="git">git diff --name-only main...HEAD</command>
35-
<comment>Check if rebase would create conflicts (dry run)</comment>
36-
<command tool="git">git rebase --dry-run main</command>
30+
<comment>Fetch latest main branch</comment>
31+
<command tool="git">git fetch origin main</command>
32+
<comment>Check if rebase would create conflicts</comment>
33+
<command tool="git">git rebase --dry-run origin/main</command>
3734
</template>
3835
</pattern>
3936

0 commit comments

Comments
 (0)