csx blog

Basic Branching and Merging两种合并的情况：Fast-forward,merge-commit1. Fast-forward 快进when you try to merge one commit with a commit that can be reached by following the first commit’s history, Git simpl...

1. Branch Management查看分支git branch查看分支并显示每个分支最后一次提交$ git branch -v iss53 93b412c Fix javascript issue* master 7a98805 Merge branch 'iss53' testing 782fd34 Add scott to the author list ...

Branches in a NutshellBranching means you diverge from the main line of development and continue to do work without messing with that main lineGit can change the way that you develop每一次stage、com...

It’s important to note that when you do a fetch that brings down new remote-tracking branches, you don’t automatically have local, editable copies of them. In other words, in this case, you don’t hav...

两种合并分支的方式：merge,rebaseWith the rebase command, you can take all the changes that were committed on one branch and replay them on a different branchrebase是如何合并分支的如下图：采用rebase方式将experiment分支上的内容合并到...