gabriel / muse public

Commits

1493
DAG Graph
⊞ 0 selected (select exactly 2 commits)
feat: add merge_result sub-object to muse merge --json (deliverable 5)
sha256:c2e22a54a80a gabriel 88 days ago task/phase1-merge-engine ⊕ diff
feat: route merge.py through STRATEGY_MAP; update hub proposal merge strategy choices ⊕ merge
sha256:0ab1022a9763 gabriel 88 days ago task/phase1-merge-engine ⊕ diff
feat: Phase 1 — MergeEngine class, --on-conflict, --history flags, strategy voc…
sha256:981b89ffe0b8 gabriel 88 days ago task/phase1-merge-engine ⊕ diff
test: Phase 1 TDD — MergeEngine class, --strategy, --on-conflict, --history (all RED)
sha256:e7283cd82f2f gabriel 88 days ago task/phase1-merge-engine ⊕ diff
test: PHANTOM_01-05 regression tests + overlay/state_merge strategy aliases Ad…
sha256:8c92016d3005 gabriel 89 days ago task/fix-phantom-conflicts ⊕ diff
fix: convergent-edit phantom conflicts in ops_commute + merge debug instrumenta…
sha256:39065bc65b1a gabriel 89 days ago task/fix-phantom-conflicts ⊕ diff
merge: pull staging/dev — advance to 0.2.0rc12 ⊕ merge
sha256:0008ab6695e3 gabriel 89 days ago dev ⊕ diff
Merge 'bump-v' into 'dev' — proposal: Bump version to v0.2.0rc12 ⊕ merge
sha256:2fe594ae1c2e gabriel 89 days ago dev ⊕ diff
bump version to v0.2.0rc12
sha256:1b0efeadb884 gabriel 89 days ago bump-v ⊕ diff
Merge staging/dev into dev ⊕ merge
sha256:051fb6e2ea6f 89 days ago dev ⊕ diff
Merge 'task/branch-delete-dry-run-tdd' into 'dev' — proposal: branch -d --dry-r… ⊕ merge
sha256:33524bf0f39d gabriel 89 days ago dev ⊕ diff
fix(branch): guard -d --dry-run against destructive writes; add TDD suite
sha256:e237dc0e8122 gabriel 89 days ago task/branch-delete-dry-run-tdd ⊕ diff
Merge staging/dev into dev ⊕ merge
sha256:0cd2f3d00f3b 89 days ago dev ⊕ diff
Merge 'task/restore-diff-dotdot' into 'dev' — proposal: Restore .. range syntax… ⊕ merge
sha256:7ac80bc14861 gabriel 89 days ago dev ⊕ diff
fix(diff): restore .. range syntax lost in --allow-empty merge
sha256:fb06ee1c470e gabriel 89 days ago task/restore-diff-dotdot ⊕ diff
Merge staging/dev into dev ⊕ merge
sha256:c2243d1f1407 89 days ago dev ⊕ diff
Merge 'task/log-dotdot-range-syntax' into 'dev' — proposal: Add .. range syntax… ⊕ merge
sha256:0a346d9cd685 gabriel 89 days ago dev ⊕ diff
feat(log): support A..B range syntax — commits on B not reachable from A (closes #28)
sha256:8063bdadd934 gabriel 89 days ago task/log-dotdot-range-syntax ⊕ diff
merge: pull staging/dev — dotdot range syntax for diff ⊕ merge
sha256:7f4bda1d5677 gabriel 89 days ago dev ⊕ diff
Merge 'task/dotdot-range-syntax' into 'dev' — proposal: Add .. range syntax to … ⊕ merge
sha256:4ca0dc1a2cf3 gabriel 89 days ago dev ⊕ diff
feat(diff): support a..b range syntax as sugar for two positional args (closes #27)
sha256:f30216fc8207 gabriel 89 days ago task/dotdot-range-syntax ⊕ diff
Merge 'task/fix-branch-delete-dry-run' into 'dev' — proposal: Fix branch delete… ⊕ merge
sha256:18e585c043b1 gabriel 89 days ago dev ⊕ diff
fix(branch): dry-run flag ignored on branch delete (closes #25)
sha256:42d0a10d0939 gabriel 89 days ago task/fix-branch-delete-dry-run ⊕ diff
fix: stream mpack downloads without size cap _urllib_do gains an optional max_…
sha256:6b91dc90e1c5 gabriel 91 days ago dev ⊕ diff
merge: pull local/dev — resolve trivial _EXT_MAP symbol conflict (identical on … ⊕ merge
sha256:c5131d76c6ea gabriel 93 days ago dev ⊕ diff
Merge 'feat/test-merge-6' into 'dev' — proposal: Proposal flow and ls-remote fixes ⊕ merge
sha256:c3c2a0ffa1f8 gabriel 93 days ago dev ⊕ diff
fix: ls-remote signing identity uses resolved remote URL get_signing_identity …
sha256:f8e686793bb9 gabriel 93 days ago feat/test-merge-6 ⊕ diff
fixes for proposal flow
sha256:f1f585ee9ca4 gabriel 93 days ago feat/test-merge-6 ⊕ diff
testing stuff
sha256:0b2356e29f85 gabriel 94 days ago feat/test-merge-6 ⊕ diff
Merge 'feat/test-merge-5' into 'dev' — proposal: testing merge 5 ⊕ merge
sha256:0bf78fac00de gabriel 94 days ago dev ⊕ diff
30 of 1493 commits
← Newer Older →