fit Public

Notifications Fork 0 Star 0
trunk
Branches trunk
1 Branches 0 Tags
Go to file T
Code
espadonne Merge branch 'trunk' of github.com:FortranGoingOnForty/fit into trunk
8bdc994 13 Commits
app flags for non interactive mode
src fix unstable local/incoming pane highlighting
test update test files
.gitignore init, build things
Makefile packaging things
PKGBUILD packaging things
README.md add readme
fit.spec packaging things
fpm.toml init, build things

fit

(noun) : something clever never

A terminal-based merge conflict resolver with a three-pane TUI interface, written in Modern Fortran.

Features

  • Three-Pane Layout: Visual side-by-side comparison similar to VS Code's merge conflict UI

    • Left pane: Incoming changes (from remote/HEAD)
    • Right pane: Local changes (current branch)
    • Bottom pane: Live preview of your resolution choice

  • Color-Coded Diffs:

    • Green + for incoming additions
    • Red - for local changes
    • Clear visual distinction between versions

  • Sequential Navigation: Navigate through multiple conflicts with keyboard shortcuts

  • Interactive Resolution: Choose incoming, local, or both changes for each conflict

Installation

Prerequisites

Build

fpm build

Install

fpm install

Usage

fit <file-with-conflicts>

Example:

fit myfile.txt

Keyboard Controls

Key Action
i Select incoming changes (from remote/HEAD)
l Select local changes (current branch)
b Select both changes (incoming then local)
n / → / ↓ Navigate to next conflict
p / ← / ↑ Navigate to previous conflict
s Save resolved file and quit
q / ESC Quit without saving