Skip to content
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

Update Merge Conflicts Lesson #738

Open
wvmitchell opened this issue Sep 14, 2023 · 1 comment
Open

Update Merge Conflicts Lesson #738

wvmitchell opened this issue Sep 14, 2023 · 1 comment
Assignees
@letakeane
Labels
Lesson An issue affecting a lesson M1 M1 task

Comments

@wvmitchell
Copy link
Collaborator

Lesson to be updated: Merge Conflicts

Summary of changes needed:

  • The current lesson points to a video which is out of date compared to new versions of VSCode
  • VSCode uses the newer, 3 way editor
  • Recommendation is to use a different video that shows students how to use this resource

Lesson creation guidelines (also on FE Hub)
@wvmitchell wvmitchell added M1 M1 task Lesson An issue affecting a lesson labels Sep 14, 2023
@letakeane letakeane self-assigned this Oct 16, 2023
@letakeane letakeane mentioned this issue Oct 18, 2023
Merged
@letakeane
Copy link
Contributor

PR: #748

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

@letakeane letakeane

Labels
Lesson An issue affecting a lesson M1 M1 task
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@wvmitchell @letakeane