update instructions of dom merge conflict workshop - #1991
Open
Poonam-raj wants to merge 1 commit into
Open
Conversation
to direct people more directly on the DOM task, removing every task except buttons and counter, to get people to the point of resolving a merge conflict
✅ Deploy Preview for cyf-common ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
✅ Deploy Preview for cyf-curriculum ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
illicitonion
approved these changes
Aug 24, 2026
Comment on lines
45
to
48
| ``` | ||
| git switch main | ||
| git pull origin main | ||
| ``` |
Member
There was a problem hiding this comment.
Suggested change
| ``` | |
| git switch main | |
| git pull origin main | |
| ``` | |
| ``` | |
| git switch main | |
| git pull origin main | |
| ``` | |
| Then each create your own branch with a unique name. |
github-project-automation
Bot
moved this from 📋 Backlog
to 👀 In review
in Curriculum Planning
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
to direct people more directly on the DOM task, removing every task except buttons and counter, to get people to the point of resolving a merge conflict