On Thu, Feb 3, 2022 at 8:48 PM Josh Steadmon <steadmon@xxxxxxxxxx> wrote: > > On 2022.02.02 07:34, Elijah Newren via GitGitGadget wrote: [...] > > +USAGE NOTES > > +----------- > > + > > +git-merge-tree was written to be low-level plumbing, similar to > > +hash-object, mktree, commit-tree, update-ref, and mktag. Thus, it could > > +be used as a part of a series of steps such as > > + > > + NEWTREE=$(git merge-tree --write-tree $BRANCH1 $BRANCH2) > > + test $? -eq 0 || die "There were conflicts..." > > + NEWCOMMIT=$(git commit-tree $NEWTREE -p $BRANCH1 -p $BRANCH2) > > + git update-ref $BRANCH1 $NEWCOMMIT > > + > > +However, it does not quite fit into the same category of low-level > > +plumbing commands since the possibility of merge conflicts give it a > > +much higher chance of the command not succeeding. > > I found this final paragraph confusing. It seems to be hinting at some > conclusion it expects readers to make, but I haven't been able to figure > out what. Could this be made more explicit, or perhaps dropped > altogether? Yep, I'll drop it.
