This project is just a demo how to use git
-
git init
-
git status
-
git add
-
git commit
-
git log
-
git show
-
git diff
-
working directory
-
staging area
-
git repository
-
git checkout --
-
git reset
-
git checkout -b (branching)
-
git checkout
-
git merge
-
git reset --soft <to_commit>
-
git reset --mixed <to_commit>
-
git reset --hard <to_commit>
-
git revert
-
gitignore
-
git clone
-
git pull
-
Pull request
- git checkout -b <feature_branch>
- git push origin
- create a pull request on Github
- review code
- merge to master
//Resolve conflicts When will conflicts happen? 1. Changing the same file + same line 2. A deleted file X, B modified file x
-
Method 1:
- Using 'git rebase'
- Resole conflict
- Push again with -f
-
Method 2:
- Merge updated master to feature branch
- Resolve conflict
- Commit and push