Git vol 2
1 like720 views
The document outlines a sequence of Git commands for managing branches and merging changes. Key actions include creating a branch, checking out files, committing changes, merging branches, and pushing updates to a remote repository. It also contains a conflict resolution strategy using the 'ours' merge strategy.
Related topics:1 of 29
Downloaded 12 times
More Related Content
What's hot (20)
Ad
Viewers also liked (20)
Ad
Recently uploaded (20)
Git vol 2
- 2. • • •
- 7. file ...
- 8. git add file file ...
- 9. git commit
- 11. git checkout master git merge task1
- 14. git fetch origin
- 15. git push origin master
- 18. git fetch
- 20. git push origin master
- 23. git push origin task1
- 24. git fetch origin
- 25. git checkout –t origin/task1
- 27. • • <<<<<<< HEAD some code ======= • some other code >>>>>>> change-branch git merge –s ours
- 28. • • • •