- shell terminal
- git >= 1.7
- Fork this repo
- Clone it on your machine
- Run
./startand follow the instructions
Each kata exposes you to a different scenario. Johnny is an imaginary developer that makes changes to simulate real life collaboration. You'll occasionally run into commit conflicts with him.
If you run into trouble you can just re run the kata and it will reset the world.
git status
git remote -v
git branch
git branch -a
git log origin/master..HEAD
git diff origin/master..HEAD
git stash
git pull --rebase
git stash pop
git commit -am "My change"
git pull
git commit -am "Merging conflicts"
git push
git commit -am "My change"
git pull --rebase
git add .
git rebase --continue
git rebase -i origin/master
change:
1 pick 0a0113f commit 1
2 pick 9106e18 commit 2
3 pick ff13755 commit 3
4 pick 844674c commit 4
To:
1 r 0a0113f commit 1
2 f 9106e18 commit 2
3 f ff13755 commit 3
4 f 844674c commit 4
reenter the git message
See Kata 4.
git rebase -i HEAD~4
git push -f
git add -p
React
Typescript
Django
Laravel
Facebook
Microsoft
Google
Alibaba
D3
Tencent