GitCat v1.2.0

Features

• Added an operation-aware merge conflict editor with Base, Ours, Theirs and editable result views, guarded side selection, delete and stage actions, and conservative Git rerere reuse.
• Added bulk conflict resolution for all conflicts or a selected folder, including mark-resolved and take-one-side actions.
• Added an operation banner with continue, skip and abort actions, stopped-commit details, and rebase progress.
• Added customizable themes with import and export support.
• Added editors for all ten graph lane colors, with independent reset controls and the GitLens palette as the default.
• Added a graph column menu for hiding and restoring individual commit-list columns.
• Added a repository tab overview and refreshed the repository tab presentation.
• Added a stash context menu and a default stash message.
• Added per-status file counts and parent commit links to commit details.
• Added GitKraken-style graph lane priority, branch-span colors, merge routing, stash lanes and deterministic edge layering.

Improvements

• The checked-out branch and WIP now own the primary graph lane, while main or master stays secondary when another branch is active.
• Stashes now use dashed, short-lived side lanes and keep their own colors without displacing HEAD or the default branch.
• Branch labels, row highlights, remote labels and graph connectors now consistently use their branch color and connection state.
• Merge commits are rendered as compact junction dots, with square edge bends and continuous foreground routes at crossings.
• The diff now opens directly in place of the graph; the redundant graph/diff tab bar was removed.
• Commit details now have a clearer header, SHA and co-author presentation.
• Graph headers remain outside the scrollbar, and keyboard navigation from WIP scrolls the selected commit into view correctly.
• The settings UI was reorganized around reusable theme presets and persisted importable settings.
• The desktop application and Git CLI backend were split into focused modules to make future changes easier to isolate.
• Arbitrary Tailwind values were replaced with shared theme tokens for more consistent styling.

Fixes

• Fixed graph lane and color ordering across checkout changes, merges, WIP rows, stashes, disconnected histories and histories wider than the ten-color palette.
• Fixed graph paths changing color where several branches overlap or converge; the physically backmost route now remains on top.
• Fixed merge parents moving out of their assigned lanes and graph edges losing their straight visible runs around bends.
• Fixed branch-label connectors appearing detached, painting over graph edges, or dimming differently from their labels.
• Fixed stash rows appearing out of reflog order and completed stash lanes not being reused.
• Fixed stash history being based on the wrong commit, duplicate stash messages, and stash colors overriding the HEAD color.
• Fixed stashing untracked files by staging them explicitly before creating the stash.
• Fixed graph color pickers updating the wrong lane colors.
• Fixed graph column headers entering the horizontal scrollbar.
• Fixed down-arrow navigation from the WIP row failing to reveal the next selected commit.