Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .roo/rules-issue-fixer/1_Workflow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@
Use appropriate tools:
- apply_diff for targeted changes
- write_to_file for new files
- search_and_replace for systematic updates

After each significant change, run relevant tests:
- execute_command to run test suites
Expand Down
2 changes: 1 addition & 1 deletion .roo/rules-merge-resolver/2_best_practices.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<principle priority="high">
<name>Escape Conflict Markers</name>
<description>
When using apply_diff or search_and_replace tools, always escape merge
When using apply_diff, always escape merge
conflict markers with backslashes to prevent parsing errors.
</description>
<example><![CDATA[
Expand Down
25 changes: 3 additions & 22 deletions .roo/rules-merge-resolver/3_tool_usage.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</priority>

<priority level="3">
<tool>apply_diff or search_and_replace</tool>
<tool>apply_diff</tool>
<when>To resolve conflicts by replacing conflicted sections</when>
<why>Precise editing of specific conflict blocks</why>
</priority>
Expand Down Expand Up @@ -127,25 +127,6 @@ function mergedImplementation() {
]]></example>
</tool>

<tool name="search_and_replace">
<best_practices>
<practice>Use for simple conflict resolutions</practice>
<practice>Enable regex mode for complex patterns</practice>
<practice>Always escape special characters</practice>
</best_practices>

<example><![CDATA[
<search_and_replace>
<path>src/config.ts</path>
<search>\<<<<<<< HEAD[\s\S]*?\>>>>>>> \w+</search>
<replace>// Resolved configuration
const config = {
// Merged settings from both branches
}</replace>
<use_regex>true</use_regex>
</search_and_replace>
]]></example>
</tool>
</tool_specific_guidance>

<tool_combination_patterns>
Expand Down Expand Up @@ -215,7 +196,7 @@ const config = {
<scenario name="malformed_conflicts">
<description>Conflict markers are incomplete or nested</description>
<approach>
Use search_and_replace with careful regex patterns
Use apply_diff with precise search blocks; split into multiple targeted edits if needed
Manual inspection may be required
</approach>
</scenario>
Expand All @@ -232,7 +213,7 @@ const config = {
<description>Code contains literal conflict marker strings</description>
<approach>
Extra careful escaping in diffs
Consider using search_and_replace with precise patterns
Prefer apply_diff with precise search blocks
</approach>
</scenario>
</error_handling>
Expand Down
Loading