Git learning Notes (vi) branch management

Learn the notes from the Liaoche Teacher's git tutorial to review them later.

★★★★★ Create, merge, and delete branches.

★ Create Branch

git branch branchname--------Create a branch

git checkout branchname-----Switch to Branch

The above two commands can be combined as: Git checkout-b branchname Create and switch to branch

★ Merge Branches

git merge branchname-------merge specified branch to current branch

★ Delete Branch

Git branch-d branchname

★ View All Branches

Git branch

★★★★★ conflict Fix

When two branches conflict, unable to merge, open the file, modify the conflict code, and then Add,commit.

★★★★★ Branch Management principle

★ Ruan Yi Feng Blog

★ Xuefeng Liu

Git learning Notes (vi) branch management