gat
Coming Q2 2026

// gat conflicts

Resolve conflicts directly in the terminal with an interactive UI, using the keyboard, making conflict resolution easier

Interactive Resolution
gat conflicts

Resolve all conflicts with interactive keyboard navigation

Keyboard Navigation
gat conflicts --file src/main.js

Focus on specific files with efficient keyboard controls

What Will gat conflicts Do?

The gat conflicts command will revolutionize conflict resolution by providing an interactive terminal interface with keyboard navigation, making it faster and easier to resolve merge conflicts without leaving the terminal.

Planned features:

  • Interactive UI: Visual conflict resolution directly in the terminal
  • Keyboard navigation: Fast resolution with arrow keys and shortcuts
  • Smart suggestions: Automatic resolution suggestions for common conflicts
  • Undo/Redo support: Safe experimentation with conflict resolutions

Planned Use Cases

Merge Conflict Resolution
# Resolve all conflicts interactively
gat conflicts
# Focus on specific file conflicts
gat conflicts --file src/components/Header.tsx

Quickly resolve merge conflicts with an intuitive keyboard-driven interface.

Rebase Conflict Handling
# Resolve rebase conflicts step by step
gat conflicts --rebase --continue
# Preview resolution before applying
gat conflicts --preview --dry-run

Handle complex rebase conflicts with guided resolution and preview capabilities.

Team Conflict Standards
# Use team resolution preferences
gat conflicts --team-rules --auto-resolve

Apply team-defined conflict resolution rules for consistent handling across projects.

Planned Keyboard Shortcuts

Arrow Keys: Navigate between conflicts and resolution options
Enter/Space: Accept current resolution or apply suggestion
Tab: Switch between different resolution strategies
Ctrl+Z/Y: Undo and redo resolution decisions

Safety Features

Preview Mode

See exactly how conflicts will be resolved before applying changes to your files.

gat conflicts --preview
gat conflicts --dry-run --show-diff

Automatic Backups

Create automatic backups of conflicted files before resolution, with easy rollback options.

gat conflicts --backup --timestamp
gat conflicts --restore-backup

Future Feature

This command is planned for Q2 2026. The exact API and features may change during development. Stay tuned for updates on our roadmap!

// Related Commands

gat merge
smart branch merging

Smart branch merging with automatic conflict detection and resolution suggestions.

gat update
smart git pull

Smart git pull with automatic conflict detection and resolution suggestions.