girdenis-p
commented
9 months ago After asking, there seems to be no content we can use from previous merge conflict workshops. However, Mitch has recently published a new merge conflict workshop. I would ask that someone has a short glance at its instructions and suggest any feedback. I would be able to use this to make a pull request on this workshop or we could decide if it is unsuitable for purpose.
For example, I would suggest that it could benefit from an additional task that could teach how to merge a refactor while preserving new content from a different branch instead of just essentially removing the changes from the other branch (as it's current state requires).
kfklein15
There is a need for trainees to have a better understanding of merge conflicts and how to resolve them, as it has been mentioned that in the past this has caused issues with the flow of the final projects.
For this issue to be resolved, there must be a sufficient merge conflict workshop with a clear structure in the curriculum (this may be reused from an old workshop, if it exists, or designed from scratch). A sufficient merge conflict workshop is one in which trainees have learned about how to resolve merge conflicts that are likely to appear during the Launch.