mike/kickstart.nvim
1
1
Fork 0
forked from Neptune/mirror.kickstart.nvim
Code Issues Pull requests Releases 40 Wiki Activity Actions
40 releases 40 tags
  • v1.28.1 c83584fed9

    v1.28.1 — Gravity Sync Merge UI Fixes
    All checks were successful
    CI / json-check (push) Successful in 9s
    Details
    CI / manifest (push) Successful in 7s
    Details
    CI / security (push) Successful in 9s
    Details
    Publish / detect-release (push) Successful in 6s
    Details
    CI / lua-check (push) Successful in 12s
    Details
    CI / sast (push) Successful in 17s
    Details
    Publish / tag (push) Successful in 8s
    Details
    Publish / promote-release (push) Successful in 2s
    Details
    Stable

    Gravity Bot released this 2026-03-16 08:21:47 +00:00 | 97 commits to master since this release

    What's Changed

    Bug Fixes

    • Fix hunk acceptance persistence — Change detection now compares against hashes recorded at resolution time, preventing auto-sync from overwriting merge results on next VimEnter (OP#2249)
    • Fix trailing newline handling — Check both source and system files for trailing newlines in merge resolve, preventing hash mismatches after "Accept All Left" (OP#2249)
    • Normalize trailing newlines — Strip trailing newlines from both buffers on load to prevent phantom hunks that can't be resolved visually (OP#2249)

    Features

    • Clarify diff preview labels — Rename buffers to gravity://repo/ and gravity://local/, update picker descriptions to "repo changed" / "local changed", add legend to diff preview (OP#2250)
    • Accept-local-and-create-override action — New save menu option writes local content to configs.overrides/ to prevent recurring diffs for intentional local divergence (OP#2251)
    • Inline help — Press ? in merge view for a floating help window with all keybindings (OP#2252)
    • Hunk navigation with counter — JetBrains-style hunk counter in statusline, n/p keys to navigate, auto-jump to first hunk on open (OP#2278)
    • Per-hunk accept with < and > — < accepts repo version (diffget), > keeps local version (diffput), both resolve the hunk and advance (OP#2279)
    • Save menu with local/repo/override options — Enter opens a menu: save locally, save + update repo file (with optional automated release agent), or save + create override (OP#2280)

    Tests

    • 6 new test cases covering merge persistence (partial merge, keep right, external changes) and override creation (OP#2256)
    • All 20 tests passing

    Tasks

    • OP#2249: Fix hunk acceptance persistence in merge view
    • OP#2250: Clarify diff preview labels: repo vs local
    • OP#2251: Add accept-local-and-create-override action in merge view
    • OP#2252: Add inline help to merge view
    • OP#2256: Test gravity sync merge UI fixes
    • OP#2278: Hunk navigation with counter and persistent status bar
    • OP#2279: Per-hunk accept with < and > directional keys
    • OP#2280: Save menu with local/repo/override options and automated release
    Downloads