Repository navigation
Share tree merging through the server - #279
Closed
nishu-builder wants to merge 1 commit into
Closed
nishu-builder wants to merge 1 commit into
nishu-builder wants to merge 1 commit into
Conversation
nishu-builder
added this pull request to stack #283
September 24, 2026 02:11
nishu-builder
force-pushed
the
codex/git-tree-tools-20260924-70793d
branch
from
September 24, 2026 17:45
3ea5374 to
dab3352
Compare
nishu-builder
commented
Sep 24, 2026
nishu-builder
left a comment
nishu-builder
left a comment
Contributor
Author
There was a problem hiding this comment.
Parsimony review. Both new primitives duplicate existing ones: merge-tree duplicates std/merge, and commit-tree duplicates caos put-commit. Details inline. See also the #278 review on whether these need to be model-facing tools at all.
Generated by Claude Code
nishu-builder
force-pushed
the
codex/git-tree-tools-20260924-70793d
branch
from
September 25, 2026 06:02
dab3352 to
75bae9e
Compare
nishu-builder
changed the title
Contributor
Author
|
Closing: most of what this was for is already on main. Generated by Claude Code |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge source trees directly in the server’s existing Git store. The endpoint accepts either an explicit base and two trees, or two commits whose merge base Git finds.
Both
std/mergeandstd/git-merge-treeuse it, so ordinary merges no longer fetch a repository into a worker.std/git-commit-treeformats commit headers and uses the existingcaos put-commitcommand.