1. Github Usage Scenarios
Steve Ahn

2. A
master
This is action items to to for next stage.
: Branch
: Commit
master
: Current Branch

3. Step 1
Clone a repository and
make own feature branches

4. develop
A
master
Step 1. <Origin repos>
1. Clone origin
2. Create `feature/<name>` branch
3. Checkout `feature/<name>` branch
4. Push branch to origin

5. develop
A
master
Step 1. <Dale’s repos>
feature/
dale

6. develop
A
master
Step 1. <David’s repos>
feature/
david

7. develop
A
master
Step 1. <Steve’s repos>
feature/
steve

8. develop
feature/
steve
A
master
Step 1. <Origin Repos>
feature/
dale
feature/
david

9. Step 2
Make a first commit and
push to origin

10. develop
A
master
Step 2. <Dale’s repos>
feature/
dale
1. Make a commit to `feature/dale`
2. Push to `origin/feature/dale`

11. develop
A
master
Step 2. <Dale’s repos>
feature/
dale
B

12. develop
feature/
steve
A
master
Step 2. <Origin Repos>
feature/
dale
feature/
david
B
1. Pull request `feature/dale` to `develop`
2. Review `feature/dale`
3. Merge `feature/dale` to `develop`
4. Remove `feature/dale` branch

13. develop
feature/
steve
A
master
Step 2. <Origin Repos>
feature/
david
B C
“--no-ff merged”

14. develop
A
master
Step 2. <Dale’s repos>
feature/
dale
B

15. develop
A
master
Step 2. <David’s repos>
feature/
david

16. develop
A
master
Step 2. <Steve’s repos>
feature/
steve

17. Step 3
Fetch changes of origin repository

18. develop
A
master
Step 3. <Dale’s repos>
feature/
dale
B
1. Pull `origin/develop` to `develop`
2. Remove `feature/dale`

19. A
master
Step 3. <Dale’s repos>
B
develop
C

20. develop
A
master
Step 3. <Steve’s repos>
feature/
steve
1. Pull `origin/develop` to `develop`
2. Merge `develop` to `feature/steve`

21. A
master
Step 3. <Steve’s repos>
feature/
steve
B
develop
C
“fast forward merged”

22. develop
A
master
Step 3. <David’s repos>
feature/
david

23. Step 4
Make a conflict commit and
merge to origin

24. develop
A
master
Step 4. <David’s repos>
feature/
david
1. Make a commit to `feature/david`
2. Pull `origin/develop` to `develop`

25. A
master
Step 4. <David’s repos>
feature/
david
B
develop
C
D
1. Merge `develop` to `feature/david`

26. A
master
Step 4. <David’s repos>
feature/
david
B
develop
C
D E
“merged”
1. Push `feature/david` to origin

27. develop
feature/
steve
A
master
Step 4. <Origin Repos>
B C
feature/
david
D E
1. Pull request `feature/david` to `develop`
2. Review `feature/david` branch
3. Remove `feature/david` branch

28. develop
feature/
steve
A
master
Step 4. <Origin Repos>
B C
D E
F
“--no-ff merged”

29. Step 5
Fetch changes of origin again

30. develop
feature/
steve
A
master
Step 5. <Origin Repos>
B C
D E
F

31. A
master
Step 5. <Dale’s repos>
B
develop
C
1. Pull `origin/develop` to `develop`

32. A
master
Step 5. <Dale’s repos>
B
develop
C
D E
F

33. A
master
Step 5. <Steve’s repos>
feature/
steve
B
develop
C
1. Pull `origin/develop` to `develop`

34. A
master
Step 5. <Steve’s repos>
feature/
steve
B
develop
C
D E
F

35. A
master
Step 5. <David’s repos>
feature/
david
B
develop
C
D E
1. Pull `origin/develop` to `develop`

36. A
master
Step 5. <David’s repos>
feature/
david
B C
D E
develop
F

37. The End