git simple to use (next article)

One, GIT branch management

In the beginning, Master is a line, Git uses master to point to the latest commit, then head to master to determine the current branch, and head is to point to the current branch.

1. Create a Release-branch branch

$ git checkout-b release-branch

Switched to a new branch "Release-branch"

2. View all Branches

$ git branch //The branch name you are using will have a *

3. Switch back to the master branch

$ git checkout Master

switched to Branch "Master"

4. Combine the code developed in Release-branch with the master branch

$ git merge release-branch

5. Delete a branch

$ git branch-d release-branch

Ii. resolution of the conflict

1.git use <<<<<,=====,>>>>> to mark the contents of different branches,

2. Manually resolve the conflicting file, then git add "conflict file" and then submit

3. View branching consolidation: $ git log--graph--pretty=online--abbrev=commit

git simple to use (next article)