Skip to content

0.5.7

Choose a tag to compare

View all tags
@github-actions github-actions released this 05 Aug 17:30
· 38 commits to main since this release
0.5.7
013140a

Update notes 0.5.7

Warning

This release requires a Termux runner update (v5 → v6): after updating the plugin, re-run the install command. The version handshake will remind you until the runner matches. The companion app also changed — install the new APK from this release.

Manual merge-conflict resolution

  • Conflicted files are marked with a warning icon in the status panel.
  • Tapping a text conflict opens a resolution pane: the file with real line numbers, each conflict block showing Local — yours (HEAD) against Remote — theirs (branch or commit), with per-block Keep local (yours) / Keep remote (<commit>) buttons on the marker rows. Lines wrap, so the buttons never scroll out of reach. Once all blocks are resolved, one tap marks the file resolved (stages it).
  • Files the pane cannot display (binary) open a context menu instead; the Git menu for any conflicted file now offers whole-file keep local / keep remote (confirmed, runner v6 git checkout --ours|--theirs + mark resolved, protected paths refused) and Open in default app.
  • As always, nothing is ever resolved automatically — every choice is an explicit tap, and abort merge remains available.
  • Blocks that are still unresolved are written back with Obsidian-safe markers (-<<<<<<< / -======= / ->>>>>>>), so a half-resolved note no longer renders as headings and blockquote soup in the editor. Both marker forms are understood; git semantics are unaffected.

Diff pane

  • Fixed: line numbers now scroll vertically together with the content (they are sticky table cells instead of absolutely positioned overlays); they still stay visible while scrolling horizontally.
  • New setting "Wrap long lines in diffs" — wraps instead of horizontal scrolling (shared, cosmetic, stored in data.json).

Companion app

  • Versions are shown stacked — companion, plugin, runner — with the lagging part highlighted in red.
  • An outdated runner no longer shows "all steps done": the screen explains the problem and shows an Update runner button that copies the release-pinned install command and opens Termux.

Internals

  • Runner v6: new resolve-conflict action; commit-ish validation unchanged otherwise. 174 unit tests, 178 e2e checks.

Full Changelog: 0.5.6...0.5.7

Assets 9
Loading