Github Usage Scenarios

1,257 views

Published on

0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total views
1,257
On SlideShare
0
From Embeds
0
Number of Embeds
3
Actions
Shares
0
Downloads
0
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Github Usage Scenarios

  1. 1. Github Usage ScenariosSteve Ahn
  2. 2. AmasterThis is action items to to for next stage.: Branch: Commitmaster: Current Branch
  3. 3. Step 1Clone a repository andmake own feature branches
  4. 4. developAmasterStep 1. <Origin repos>1. Clone origin2. Create `feature/<name>` branch3. Checkout `feature/<name>` branch4. Push branch to origin
  5. 5. developAmasterStep 1. <Dale’s repos>feature/dale
  6. 6. developAmasterStep 1. <David’s repos>feature/david
  7. 7. developAmasterStep 1. <Steve’s repos>feature/steve
  8. 8. developfeature/steveAmasterStep 1. <Origin Repos>feature/dalefeature/david
  9. 9. Step 2Make a first commit andpush to origin
  10. 10. developAmasterStep 2. <Dale’s repos>feature/dale1. Make a commit to `feature/dale`2. Push to `origin/feature/dale`
  11. 11. developAmasterStep 2. <Dale’s repos>feature/daleB
  12. 12. developfeature/steveAmasterStep 2. <Origin Repos>feature/dalefeature/davidB1. Pull request `feature/dale` to `develop`2. Review `feature/dale`3. Merge `feature/dale` to `develop`4. Remove `feature/dale` branch
  13. 13. developfeature/steveAmasterStep 2. <Origin Repos>feature/davidB C“--no-ff merged”
  14. 14. developAmasterStep 2. <Dale’s repos>feature/daleB
  15. 15. developAmasterStep 2. <David’s repos>feature/david
  16. 16. developAmasterStep 2. <Steve’s repos>feature/steve
  17. 17. Step 3Fetch changes of origin repository
  18. 18. developAmasterStep 3. <Dale’s repos>feature/daleB1. Pull `origin/develop` to `develop`2. Remove `feature/dale`
  19. 19. AmasterStep 3. <Dale’s repos>BdevelopC
  20. 20. developAmasterStep 3. <Steve’s repos>feature/steve1. Pull `origin/develop` to `develop`2. Merge `develop` to `feature/steve`
  21. 21. AmasterStep 3. <Steve’s repos>feature/steveBdevelopC“fast forward merged”
  22. 22. developAmasterStep 3. <David’s repos>feature/david
  23. 23. Step 4Make a conflict commit andmerge to origin
  24. 24. developAmasterStep 4. <David’s repos>feature/david1. Make a commit to `feature/david`2. Pull `origin/develop` to `develop`
  25. 25. AmasterStep 4. <David’s repos>feature/davidBdevelopCD1. Merge `develop` to `feature/david`
  26. 26. AmasterStep 4. <David’s repos>feature/davidBdevelopCD E“merged”1. Push `feature/david` to origin
  27. 27. developfeature/steveAmasterStep 4. <Origin Repos>B Cfeature/davidD E1. Pull request `feature/david` to `develop`2. Review `feature/david` branch3. Remove `feature/david` branch
  28. 28. developfeature/steveAmasterStep 4. <Origin Repos>B CD EF“--no-ff merged”
  29. 29. Step 5Fetch changes of origin again
  30. 30. developfeature/steveAmasterStep 5. <Origin Repos>B CD EF
  31. 31. AmasterStep 5. <Dale’s repos>BdevelopC1. Pull `origin/develop` to `develop`
  32. 32. AmasterStep 5. <Dale’s repos>BdevelopCD EF
  33. 33. AmasterStep 5. <Steve’s repos>feature/steveBdevelopC1. Pull `origin/develop` to `develop`
  34. 34. AmasterStep 5. <Steve’s repos>feature/steveBdevelopCD EF
  35. 35. AmasterStep 5. <David’s repos>feature/davidBdevelopCD E1. Pull `origin/develop` to `develop`
  36. 36. AmasterStep 5. <David’s repos>feature/davidB CD EdevelopF
  37. 37. The End

×