mirror of
https://github.com/kwhittle/obsidian-github-tools.git
synced 2026-07-22 07:44:31 +00:00
8c97e5f721
Branch switch and pull now try the git operation directly first and only fall back to auto-stash when local changes actually block it, fixing switches that silently failed after a pull left an unresolved conflict. The sidebar also now surfaces unresolved conflicts and stashes for the repo, with one-click resolve/abort/apply/drop actions. Also wires RELEASE_NOTES.md into the release workflow so Obsidian's plugin update view shows a short human summary instead of just a changelog compare link. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
3 lines
420 B
Markdown
3 lines
420 B
Markdown
- Branch switching and pulling now try the operation directly first, only falling back to auto-stash when local changes actually block it — fixes switches silently failing after a pull.
|
|
- Sidebar now flags unresolved git conflicts or an in-progress merge/cherry-pick, with one-click resolution (keep mine/theirs) or abort.
|
|
- New: view and manage stashes for the current repo (apply or drop) directly from the sidebar.
|