add workflow for collaboration

inbo / git-course

Course material for Git(Hub) course at INBO

https://inbo.github.io/git-course/

Creative Commons Attribution 4.0 International

3 stars 34 forks source link

add workflow for collaboration #40

Closed ElsLommelen closed 3 years ago

ElsLommelen commented 3 years ago

When preparing a workshop with focus on collaboration in GitHub for tomorrow, I noticed that a workflow covering this subject was lacking on this site, so I made one. I tried to be complementary to the material that is already present. I hope this document is a good addition to this site?

ElsLommelen commented 3 years ago

As there were some questions while using this workflow:

I elaborated the part on conflicts a bit for clarification
I added some sentences on branch management (mainly as a cheatsheet for these git commands)

ElsLommelen commented 3 years ago

@peterdesmet Are you the administrator of this repo? Could you please merge this branch? (I don't have write access to this repo.)

I think this document is complementary to the material already provided and will certainly have an additional value for those who start using GitHub after having followed a git course.

peterdesmet commented 3 years ago

Nice! Now online: https://inbo.github.io/git-course/workflow_review.html