Implementing merge/rebase?

[francisLee777]

目前看到已经支持的命令，好像只能实现git最基本的历史记录了，没有分支合并的话。[暂且不说 push等远端能力]

[thblt]

[I've used a translator to understand your message, but please use English if you can for further correspondence.] There's a draft for merge in the merge-rebase branch, which see, but I'm not sure if it's worth developing. Three-point merge in itself is a complex algorithm, and also outside of the scope of core git. Beyond the actual merging of trees, making a merge commit is in itself trivial (it's just a commit with two parents). I have no plans of implementing any network features, as I don't believe they're of any interest to a strictly didactical project such as wyag.