New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Teach merge conflicts as bonus content #84

Open

kelly-sovacool opened this issue Jan 14, 2021 · 1 comment · May be fixed by #112

Assignees

Labels

3-git-github enhancement

Member

kelly-sovacool commented Jan 14, 2021 •

edited

Loading

Sometimes learners ask about it, although there isn't typically enough time to teach it in the main lesson.

Start with this and modify it.

kelly-sovacool added the 3-git-github label

Collaborator

zenalapp commented Jan 14, 2021

Good idea - this way we can also direct them to the curriculum if they as and we don't have time to teach it.

zenalapp assigned kelly-sovacool

kelly-sovacool linked a pull request

that will close this issue

Teach merge conflicts as bonus content #112

Draft

3 tasks

kelly-sovacool assigned barnierc and unassigned kelly-sovacool

kelly-sovacool added the enhancement label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment