MySpace
MySpace
Blog
Books
Landscape
Twitter
GitHub
Tag List
git
merge
cherry-pick
rebase
apply
conflict
version-control
On this page
git鬼故事 - How `git merge` Works
Posted 2025-11-06 08:00 +0800 by
ZhangJie
‐
1 min read
分享:
This document comes from my docs.qq.com.
</div><div class=edit-page><a href=https://github.com/hitzhangjie/myspace/blob/master/content/blog/git/how_git_merge_works.md><svg xmlns="https://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentcolor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-edit-2"><path d="M17 3a2.828 2.828.0 114 4L7.5 20.5 2 22l1.5-5.5L17 3z"/></svg>Edit this page on GitHub</a></div><div class="docs-navigation d-flex justify-content-between"><a href=/blog/how_git_cherrypick_works/><div class="card my-1"><div class="card-body py-2">← git鬼故事 - How `git cherrypick` Works</div></div></a><a class=ms-auto href=/blog/how_git_rebase_works/><div class="card my-1"><div class="card-body py-2">git鬼故事 - How `git rebase` Works →</div></div></a></div></main></div></div></div><footer class="footer text-muted mt-auto"><div class=container-xxl><div class=row><div class="col-lg-8 order-last order-lg-first"><ul class=list-inline><li class=list-inline-item>Powered by <a class=text-muted href=https://www.netlify.com/>Netlify</a>, <a class=text-muted href=https://gohugo.io/>Hugo</a>, and <a class=text-muted href=https://getdoks.org/>Doks</a></li></ul></div><div class="col-lg-8 order-first order-lg-last text-lg-end"><ul class=list-inline></ul></div><div class=col-lg-8 align=right><p><font size=-1>站点构建版本：v0.2.3</font></p></div></div></div></footer><script src=/js/bootstrap.min.fdbe9b9ba88a036135318f3c721784d684ac9e3280fe282cc80d7d49f7f9c82780cd54228c1608685a230c09984300d7946fc471734d566fcebc148b65bd16db.js integrity="sha512-/b6bm6iKA2E1MY88cheE1oSsnjKA/igsyA19Sff5yCeAzVQijBYIaFojDAmYQwDXlG/EcXNNVm/OvBSLZb0W2w==" crossorigin=anonymous defer></script> <script src=/js/highlight.min.b64f1e7517e5839396950ceee4ef937fbbd3ff20aa1fdd261ce87fa457863404f35a6e5239dd57b20b37f39c2401b933deeef60af180195b16941c88f10e948d.js integrity="sha512-tk8edRflg5OWlQzu5O+Tf7vT/yCqH90mHOh/pFeGNATzWm5SOd1Xsgs385wkAbkz3u72CvGAGVsWlByI8Q6UjQ==" crossorigin=anonymous defer></script> <script src=/main.min.f16ffd9b364013a1df84be9cd7a45c470cb48639766bf5551e05bba845fe4ab150cb6436de43609bfed9af47c23bd5e395e9a10b932fa6fb2c4ee8f6cc78d7a3.js integrity="sha512-8W/9mzZAE6HfhL6c16RcRwy0hjl2a/VVHgW7qEX+SrFQy2Q23kNgm/7Zr0fCO9XjlemhC5MvpvssTuj2zHjXow==" crossorigin=anonymous defer></script> <script src=/index.min.c32c49eb6465820675be46e5090655dd8710603ad59159ca03e9918f23a957902f38229e1742f3fde821aa32550c7ca64d33c5f01a8f64f3a4227803471925a9.js integrity="sha512-wyxJ62RlggZ1vkblCQZV3YcQYDrVkVnKA+mRjyOpV5AvOCKeF0Lz/eghqjJVDHymTTPF8BqPZPOkIngDRxklqQ==" crossorigin=anonymous defer></script></body></html>