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

Lk/merge lesson #748

Merged
merged 24 commits into from
Dec 7, 2023
Merged

Lk/merge lesson #748

merged 24 commits into from
Dec 7, 2023

Conversation

letakeane
Copy link
Contributor

closes #738

Description of changes made

  • Added a note to the git merge conflicts lesson about the new VS Code merge conflict GUI
  • The note cautions the students against becoming dependent on the editor, but encourages them to explore it

Motivation for any changes

  • Students may see the button when they handle merge conflicts in their text editor
  • We want to discourage them from becoming dependent on a proprietary GUI

Questions that you have for a reviewer

  • Is the text of the note clear? understandable?

niksseif and others added 24 commits August 10, 2023 10:29
@niksseif
Enhance Outlet content and add example without using it
8727f93
Move Router prework lesson to fe curriculum
8ff9712
Add intro to router lesson to curriculum site
7a188e4
@kaylagordon
Add 2024 calendar and remove 2022 calendar
afa943e
@kaylagordon
Update format of calendar page
0370587
Align links to intro to router lesson
8284f41
@hfaerber
Merge pull request #739 from turingschool/intro-to-router-preowkr
900ca83 
Add Intro to router self study prework lesson
@kaylagordon
Remove broken community button
dbde234
@kaylagordon
Merge branch 'gh-pages' of github.com:turingschool/front-end-curricul…
f7a277b 
…um into gh-pages
@niksseif
Add note about project font.
d21921a
@niksseif
Merge pull request #735 from turingschool/Nik-FP-New
b48a5c5 
Update React Router Lesson: Enhanced Outlet Content and Example Without It
@CassandraGoose
update mod 2 instructors
86f04fd
Add resources to Cypress lesson
63b54e0
@hfaerber
Merge pull request #744 from turingschool/cypress-add-tips
63842de 
Add resources to Cypress lesson
Combine two user flows
d27b5df
Update initial examples
c366b2a
Pull important notes out of solution drop down
c4609af
@hfaerber
Merge pull request #745 from turingschool/cypress-update
10e7529 
Cypress update
Make gsm option only redux
cbf7560
Remove old links from public api list
4b392af
@hfaerber
Merge pull request #746 from turingschool/remove-context-from-stretch
8c0a821 
Remove context from stretch
Bring back museum link
8ffc689
@hfaerber
Merge pull request #747 from turingschool/remove-context-from-stretch
1d08d67 
Bring back museum link
@letakeane
Add a note about VSCode's new merge conflict GUI
f897917
@netlify
Copy link

netlify bot commented Oct 18, 2023 •
edited
Loading

✅ Deploy Preview for sage-cupcake-e1a0c3 ready!

Name Link
🔨 Latest commit f897917
🔍 Latest deploy log https://app.netlify.com/sites/sage-cupcake-e1a0c3/deploys/652ff4b26e47ee000908bb21
😎 Deploy Preview https://deploy-preview-748--sage-cupcake-e1a0c3.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@letakeane letakeane mentioned this pull request Oct 18, 2023
Open
@niksseif niksseif merged commit 07ae09c into development Dec 7, 2023
@niksseif
Copy link
Contributor

niksseif commented Dec 7, 2023

Thanks for updating this lesson, looks good to me. I'll merge this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@letakeane @niksseif @kaylagordon @hfaerber @CassandraGoose