Repository navigation

fix: merge conflicts not visible when changes are staged - #24

Merged

craigharman merged 42 commits into

mainfrom

develop

Jun 23, 2026

Merged

fix: merge conflicts not visible when changes are staged#24
craigharman merged 42 commits into
mainfrom
develop

Commits on Jun 19, 2026
- feat: continue and skip rebase
  craigharman
  committed
  874f7bc
- fix: git tests for rebasing
  craigharman
  committed
  f55ca09
- feat: liquid glass interface
  craigharman
  committed
  7e07df3
- feat: add copy to clipboard button to error banner
  craigharman
  committed
  8f7c2c9
- Merge branch 'main' into develop
  craigharman
  committed
  3852ef3
- feat:automatic software updates using Sparkle
  craigharman
  committed
  eac879e
- Gate the step on secrets.SPARKLE_PRIVATE_KEY
  
  craigharman
  and
  Copilot
  authored
  9074f29
- Ensure we are committing on the latest main branch
  
  craigharman
  and
  Copilot
  authored
  13f17fe
- Disable update option if sparkle unavailable
  
  craigharman
  and
  Copilot
  authored
  7487310
- Fail loudly on build failure
  
  craigharman
  and
  Copilot
  authored
  354016d
- Potential fix for pull request finding
  
  craigharman
  and
  Copilot
  authored
  cd5dde1
- fix: prevent appcast.xml commit from retriggering Release workflow
  Copilot
  authored
  d49ba06
- Strip any new lines from secret
  craigharman
  committed
  0c9ce1c
- Warn if sparkle not set
  
  craigharman
  and
  Copilot
  authored
  3293625
- Add guard when version already exists
  
  craigharman
  and
  Copilot
  authored
  a6a5c24
- Fix versioning issues with sparkle
  craigharman
  committed
  ff59aa8
- Potential fix for pull request finding
  
  craigharman
  and
  Copilot
  authored
  ee5d2b7
- Potential fix for pull request finding
  
  craigharman
  and
  Copilot
  authored
  730c686
- Potential fix for pull request finding
  
  craigharman
  and
  Copilot
  authored
  7b23eeb
- Skip appcast.xml when no changes
  
  craigharman
  and
  Copilot
  authored
  7e96235
- Update agents and claude files
  craigharman
  committed
  b904ab8
- fix: sign_update matched the wrong binary
  craigharman
  committed
  4f1a868
- Merge develop changes
  craigharman
  committed
  895e093
- Merge branch 'main' into develop
  craigharman
  committed
  a9338d0
- feat: allow push/pull indicators in sidebar to actually do the push/pull action
  craigharman
  committed
  626e3f8
- fix: when pushing a remote branch include the remote name as well as the branch
  craigharman
  committed
  7a1a0a6
- Do not fallback to origin show error instead
  
  craigharman
  and
  Copilot
  authored
  70df5fd
- fix: make the sparkle search less specific
  craigharman
  committed
  ff5ed2c
Commits on Jun 20, 2026
- Merge branch 'main' into develop
  craigharman
  committed
  0f530b7
- Fix release.yml
  craigharman
  committed
  b3e181d
- Merge branch 'main' into develop
  craigharman
  committed
  528f9e7
- fix: download Sparkle into project from CI
  craigharman
  committed
  ff6c4ac
- fix: access to sparkle key file
  craigharman
  committed
  6e8b217
- Merge main into develop
  craigharman
  committed
  505d31a
- Merge branch 'main' into develop
  craigharman
  committed
  93cafbd
- fix: add debugging to deployment
  craigharman
  committed
  4028d96
- Merge branch 'main' into develop
  craigharman
  committed
  fef2820
- fix: add automerge to release
  craigharman
  committed
  25103c1
Commits on Jun 21, 2026
- test:Add checks for pull/push numbers
  craigharman
  committed
  dfb183d
Commits on Jun 22, 2026
- feat:automate deployment workflow
  craigharman
  committed
  6b7a74d
Commits on Jun 23, 2026
- fix: merge conflicts not visible when files are staged
  craigharman
  committed
  1707933
- Complete merge
  craigharman
  committed
  563c1d9

Commits

Commits on Jun 19, 2026

Commits on Jun 20, 2026

Commits on Jun 21, 2026

Commits on Jun 22, 2026

Commits on Jun 23, 2026