Collaboration using GIT
Reference
1. GIT YouTube
1.1 Branch
git branch
: get branch listgit branch test1
: make a new branch named test1git checkout test1
: enter a new branch (* will move to test1). we canadd
andcommit
in a new branch.- merge
git branch master
: enter the master branchgit merge test1
: merge
git branch -d test1
: delete test1 branchgit push origin test1
: test1 branch is uploaded to GitHub.
1.2 Conflict
- When merge, If conflict, the file will be edited by Git.
gitk
: branch and history visualization
1.3 Pull Request
git fetch
: pull only changed contents.fork
: If we want to request (not as a contributor.) -> pull request -> master: merge- Fork on GitHub
- Git clone
- Edit… (add, commit, push) x n
New pull request
on GitHub ->Create pull request