Nature
Create and move the pointer
- In the version control process, while promoting the use of multiple lines of multiple tasks.
- Multiple functions simultaneously and in parallel to promote development and improve development efficiency.
- Each branch in the development process, if a branch failed to develop, will not have any impact on other branches, the branch failed to delete the restart.
1. Create a branch
git branch [branch]
2. Check branch
git branch -v
3. branch switching
git checkout [branch]
4. Merge branch
Switches to receive the modified branch execution
Merge git [branch]
5. Conflict
To merge the branch to the same place, doing different changes will conflict
solve:
- Edit the file, delete special symbols
- To modify the file to the satisfaction
- git add [filename]
- git commit -m ' "// this time commit without a file name