carpentries-incubator / carpentries-incubator/collaborative-git-and-github-lesson
Consider covering merge conflicts
Open
enhancement
- Dominant language
- R
- Stars
- 0
- Forks
- 3
- PR merge metrics
- No merged PRs in 30d
Description
From 2025-02-03-ds-cr edition:
> Add an extra exercise, in conflicts would be nice, for those groups that finish the other exercises early. The exercise on conflict could also be done individually, since everyone has their own speed.
Additional section on merge conflicts could be taught during more advanced workshops or could be used to direct more advanced participants. I think this is important to have it as merge conflicts will be faced by each participants sooner or later.
Contributor guide
Assessment
This issue has not been assessed yet.