open-sauced / intro

Empowering Your Open Source Journey: From First Contribution to Project Leadership
https://opensauced.pizza/learn
Other
497 stars 96 forks source link

docs: Move chapter "Understanding Merge Conflicts" to Let's Contribute section #92

Closed CBID2 closed 7 months ago

CBID2 commented 8 months ago

Description

This PR does the following:

  1. Move the "Understanding Merge Conflicts" chapter to the "Let's Contribute" file. This makes it easier for people to navigate the contributing files.
  2. Removes the "Understanding Merge Conflicts" file for organizational purposes.
  3. Removes the "Understanding Merge Conflicts" link from the sidebar.

What type of PR is this? (check all applicable)

Related Tickets & Documents

Closes #91

Mobile & Desktop Screenshots/Recordings

Added tests?

Added to documentation?

[optional] Are there any post-deployment tasks we need to perform?

[optional] What gif best describes this PR or how it makes you feel?

netlify[bot] commented 8 months ago

Deploy Preview for sauced-intro ready!

Name Link
Latest commit 5eb43a64d0f29200240fa2ec337dd00ae9164f55
Latest deploy log https://app.netlify.com/sites/sauced-intro/deploys/6556053803a6ed0008b1a66d
Deploy Preview https://deploy-preview-92--sauced-intro.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.

CBID2 commented 8 months ago

Made the changes @adiati98

CBID2 commented 8 months ago

Made the updates @adiati98

adiati98 commented 8 months ago

Made the updates @adiati98

Awesome! Thanks, @CBID2! There's one more thing.

I run the intro locally, and there's still "Understanding merge conflicts" on the sidebar.

update sidebar

Can you please remove it? Thanks! 😊