dime-github-trainings icon indicating copy to clipboard operation
dime-github-trainings copied to clipboard

Published 20 hours ago • verified publisher icon worldbank

Updates to next PR training

Open kbjarkefur opened this issue 4 years ago • 5 comments

Two parts:

  • Best practices for the branch-pr-merge cycle
  • How to use the branch-pr-merge cycle in your workflow

kbjarkefur avatar Oct 25 '20 22:10 kbjarkefur

  • [x] Typo in first point on 'Approve PR' slide - 45fcddd1b1120a244883d22482c73db94c6ceb9e
  • [ ] Add legend of colors to network graph slide
  • [x] Move the rightmost arrow 1 commit right in the Work directly in main/develop slide - 40a95f94162e500dc0d10c38ede0ed4cbe43877b

roshni13khincha avatar Oct 29 '20 13:10 roshni13khincha

  • [ ] Add content on branch protection

kbjarkefur avatar Oct 29 '20 15:10 kbjarkefur

  • [ ] a slide: what you should already know & what you should expect to learn from today

kbjarkefur avatar Oct 30 '20 15:10 kbjarkefur

  • [ ] the slide with that big diagram is a bit overload at first. Maybe only have the three stages, so you know that it is setup-work-merge but have the steps boxes empty until you get there

kbjarkefur avatar Oct 30 '20 16:10 kbjarkefur

  • [ ] add content on how to handle merge conflicts

And use this as a way to explain that a proper workflow like gitflow helps avoiding them

kbjarkefur avatar Oct 30 '20 16:10 kbjarkefur