Git - Advanced merge

Git - Advanced merge
https://git-scm.com/book/zh/v2/Git-%E5%B7%A5%E5%85%B7-%E9%AB%98%E7%BA%A7%E5% 90% 88% E5% B9% B6

 

 

 

git branch -v

git log dev-rgq ^master
git log master ^dev-rgq

git merge dev-rgq

git merge --abort

git reset --hard HEAD~

 

git comparison of the two branches of the difference - the heart of Zhang wipe blog shixinzhang - CSDN blog
https://blog.csdn.net/u011240877/article/details/52586664

Git commonly used commands - a branch operation - CSDN blog - Switch the blog
https://blog.csdn.net/q547550831/article/details/52269611

git merge Introduction - Robin Hu's column - CSDN blog
https://blog.csdn.net/hudashi/article/details/7664382

git merge (Branching and Merging) - Git Chinese Development Manual - Developer's Guide - Tencent cloud - cloud + community
https://cloud.tencent.com/developer/section/1138656

Different Git merge branch - forwill - blog Park
https://www.cnblogs.com/forwill/p/6524185.html

git branch branching and merging branches - crawling tortoise - blog Park
https://www.cnblogs.com/laonicc/p/6938930.html

GIT branch articles, branching and merging branches to resolve the conflict - Baidu experience
https://jingyan.baidu.com/article/48206aea68e69f216ad6b33f.html