fix: add GIT_EDITOR env var to merge-resolver mode for non-interactive rebase

[daniel-lxs]

Summary

This PR updates the merge-resolver mode to use the GIT_EDITOR environment variable for non-interactive git rebase operations, preventing the mode from hanging when git would normally open an editor.

Problem

The merge-resolver mode could hang during rebase operations when git attempts to open an interactive editor for tasks like editing commit messages or resolving rebase sequences.

Solution

Set GIT_EDITOR=true for all git rebase commands. The true command is a no-op that always succeeds, effectively bypassing any interactive prompts.

Changes Made

1. workflow.xml Updates:

• Modified initial rebase command to use GIT_EDITOR=true git rebase origin/main
• Added continue_rebase command with GIT_EDITOR=true git rebase --continue
• Added environment_variables section documenting GIT_EDITOR usage

2. tool_usage.xml Enhancements:

• Updated all rebase commands to include GIT_EDITOR=true
• Added best practices for non-interactive operations
• Created new non_interactive_operations section with:
  • Techniques for using GIT_EDITOR and GIT_SEQUENCE_EDITOR
  • Examples of commit flags to avoid prompts
  • Best practices for automation
• Added error handling scenario for interactive prompts

3. complete_example.xml Updates:

• Updated example rebase commands to use GIT_EDITOR=true
• Added key takeaway about using GIT_EDITOR for non-interactive operations

Benefits

• No Interactive Prompts: Mode won't hang waiting for editor input
• Automation-Ready: All git operations run fully automated
• Consistent Approach: GIT_EDITOR=true pattern applied consistently
• Well-Documented: Comprehensive documentation for future reference

Testing

The changes have been validated for consistency and cohesion across all affected files in the merge-resolver mode configuration.

---

Important

Set GIT_EDITOR=true for non-interactive git rebase operations in merge-resolver mode to prevent hanging due to editor prompts.

• Behavior:
  • Set GIT_EDITOR=true for non-interactive git rebase operations in 1_workflow.xml, 3_tool_usage.xml, and 4_complete_example.xml.
  • Prevents hanging during rebase by bypassing editor prompts.
• Documentation:
  • Added environment_variables section in 1_workflow.xml to document GIT_EDITOR usage.
  • Updated tool_specific_guidance in 3_tool_usage.xml with best practices for non-interactive operations.
  • Enhanced non_interactive_operations section in 3_tool_usage.xml with techniques and best practices.
  • Updated 4_complete_example.xml with examples using GIT_EDITOR=true for rebase commands.
• Commands:
  • Modified rebase commands to include GIT_EDITOR=true in 1_workflow.xml and 3_tool_usage.xml.

^{This description was created by for 61fea21. You can customize this summary. It will automatically update as commits are pushed.}