Commits

Branch selector

 main

User selector

All users

All time

Commit History

Commits on Apr 27, 2026

• chore: bones

  bobisme

  committed
  47b5094

  Copy full SHA for 47b5094

Commits on Apr 26, 2026

• feat(merge): replace 6 git CLI calls in collect.rs with gix (bn-2jpn)

  bobisme

  committed
  aacf66b

  Copy full SHA for aacf66b

Commits on Apr 22, 2026

• chore(ci): fix crates.io publish workflow + bump to 0.60.1

  Show description for fd85e10
  bobisme

  committed
  fd85e10

  Copy full SHA for fd85e10

• chore: bump version to 0.60.0

  Show description for c95bfd2
  bobisme

  committed
  c95bfd2

  Copy full SHA for c95bfd2

• docs: sync rebase

  bobisme

  committed
  c8ec058

  Copy full SHA for c8ec058

Commits on Apr 21, 2026

• chore: bones

  bobisme

  committed
  646aa56

  Copy full SHA for 646aa56

• style: run cargo fmt

  Show description for 6205b15
  bobisme

  committed
  6205b15

  Copy full SHA for 6205b15

• fix(rebase): clear stale manual-resolve state

  Show description for 0765a2d
  bobisme

  committed
  0765a2d

  Copy full SHA for 0765a2d

• fix(merge): handle submodule gitlinks as opaque entries during rebase (bn-3hqg)

  bobisme

  committed
  84cd723

  Copy full SHA for 84cd723

• fix(rebase): serialize concurrent sync --rebase via workspace lock (bn-1d1g)

  bobisme

  committed
  7a56581

  Copy full SHA for 7a56581

• fix(merge): refuse merge when HEAD tree has tool-authored conflict placeholders (bn-28d1)

  bobisme

  committed
  19b7042

  Copy full SHA for 19b7042

• fix(merge): gate on structured sidecar instead of marker-text scan (bn-m6ad, bn-3pgl)

  bobisme

  committed
  44b4301

  Copy full SHA for 44b4301

• fix(rebase): suppress phantom conflict when merge sides converge + better --keep matching (bn-2ras)

  bobisme

  committed
  932410d

  Copy full SHA for 932410d

• fix(resolve): close 6 adversarial bones (bn-2cc1, bn-2gex, bn-24tl, bn-3oau, bn-2pry, bn-mg0j)

  bobisme

  committed
  044429c

  Copy full SHA for 044429c

• fix(rebase): preserve merge-commit parent count when replaying (bn-7mbe)

  bobisme

  committed
  a34fd30

  Copy full SHA for a34fd30

• fix(merge): materialize inlines side content and labels sides correctly (bn-324m, +bn-ad5z +bn-3gbi)

  bobisme

  committed
  7066f72

  Copy full SHA for 7066f72

• fix(merge): follow renames when epoch modifies the renamed-from path (bn-3525)

  bobisme

  committed
  1c14f29

  Copy full SHA for 1c14f29

• fix(merge): treat Added on conflicted path as Modified (bn-3l5p)

  bobisme

  committed
  716fca0

  Copy full SHA for 716fca0

• fix(apply): thread FileChange.mode through Added paths (bn-nsz0)

  bobisme

  committed
  0e0b60c

  Copy full SHA for 0e0b60c

Commits on Apr 20, 2026

• feat(resolve): consume ConflictTree sidecar for structured resolution (bn-3rah)

  bobisme

  committed
  695f098

  Copy full SHA for 695f098

• test(rebase): lock semantics preservation + narrow fidelity property (bn-28rd, Phase 7 of bn-gjm8)

  bobisme

  committed
  9a3316b

  Copy full SHA for 9a3316b

• refactor(rebase): route through maw-core::merge engine (bn-elj0, Phase 5 of bn-gjm8)

  bobisme

  committed
  15f0fa7

  Copy full SHA for 15f0fa7

• feat(merge): add materialize + legacy/structured sidecar projections (bn-11b0, Phase 4 of bn-gjm8)

  bobisme

  committed
  553aa8f

  Copy full SHA for 553aa8f

• feat(merge): add diff_patchset historical patch extraction (bn-1lvo, Phase 3 of bn-gjm8)

  bobisme

  committed
  a2e1fea

  Copy full SHA for a2e1fea

• feat(merge): apply_unilateral_patchset handles conflict-bearing paths (bn-1n4i, Phase 2 of bn-gjm8)

  bobisme

  committed
  69eafb7

  Copy full SHA for 69eafb7

• feat(maw-git): add walk_commits, diff_trees_with_renames, set_head (bn-22zz, Phase 6 of bn-gjm8)

  bobisme

  committed
  a22922e

  Copy full SHA for a22922e

• feat(merge): add ConflictTree + MaterializedEntry + apply_unilateral_patchset skeleton (bn-3m2q, Phase 1 of bn-gjm8)

  bobisme

  committed
  fcc64cc

  Copy full SHA for fcc64cc

• chore: bones and agents

  bobisme

  committed
  16b0d51

  Copy full SHA for 16b0d51

• fix(polish): error-handling sweep (bn-2dy4, bn-2bow, bn-2blj, bn-3pkx, bn-lc1j)

  bobisme

  committed
  c458955

  Copy full SHA for c458955

• fix(working-copy): surface stash_apply failures during merge replay (bn-1psp)

  bobisme

  committed
  621b92d

  Copy full SHA for 621b92d

• fix(rebase): detect dropped merge commits and mark workspace conflicted (bn-372v)

  bobisme

  committed
  b1bb79c

  Copy full SHA for b1bb79c

• fix(undo): capture recovery snapshot before destroying local changes (bn-6cs4)

  bobisme

  committed
  1480ec7

  Copy full SHA for 1480ec7

• fix(capture): return Err when stash_create returns None on dirty workspace (bn-3mpx)

  bobisme

  committed
  f045d41

  Copy full SHA for f045d41

• chore: bones

  bobisme

  committed
  5726b4c

  Copy full SHA for 5726b4c

Commits on Apr 19, 2026

• fix(test): align lifecycle-history tests with post-bn-3h90 semantics (bn-gb8f)

  bobisme

  committed
  a0984a4

  Copy full SHA for a0984a4