netlify[bot]
commented
6 months ago Deploy Preview for cyf-workshops ready!
| Name | Link |
|---|---|
| Latest commit | 476660b316e99ca77301ddfab087071b6e808fdd |
| Latest deploy log | https://app.netlify.com/sites/cyf-workshops/deploys/6603032fa3fe2b00095f24b6 |
| Deploy Preview | https://deploy-preview-180--cyf-workshops.netlify.app |
| Preview on mobile | Toggle QR Code...Use your smartphone camera to open QR code link. |
To edit notification comments on pull requests, go to your Netlify site configuration.
kfklein15
leilafaez
DOM Merge Conflicts Workshop
Overview
This workshop is intended to be used during the Launch module. The workshop is intended to give trainees more experience with how merge conflicts arise and how to resolve them. The premise of the tasks is that, when implemented by two separate trainees, they have a high chance of creating a merge conflict.
Previous Trial Results
This workshop was trialled by @leilafaez, @levilu800b, and @Sandra-Duarte. And I invite them to help review this pull request.
As per feedback, I have:
Side Note
This workshop may benefit from being created as a stand-alone repo similar to how previous merge conflict workshops have been. This would be purely for ease of use. I would be happy to recreate this pull request on an empty new repo if you agree to making a stand-alone repo.