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.

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

feat: adds glossary to OpenSauced's getting started #210

Closed
wants to merge 17 commits into from
Closed

feat: adds glossary to OpenSauced's getting started #210

wants to merge 17 commits into from

Conversation

Lymah123
Copy link
Contributor

Description

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

  • 🍕 Feature
  • 🐛 Bug Fix
  • 📝 Documentation Update
  • 🎨 Style
  • 🧑‍💻 Code Refactor
  • 🔥 Performance Improvements
  • ✅ Test
  • 🤖 Build
  • 🔁 CI
  • 📦 Chore (Release)
  • ⏩ Revert

Related Tickets & Documents

Mobile & Desktop Screenshots/Recordings

Added tests?

  • 👍 yes
  • 🙅 no, because they aren't needed
  • 🙋 no, because I need help

Added to documentation?

  • 📜 README.md
  • 📓 docs.opensauced.pizza
  • 🍕 dev.to/opensauced
  • 📕 storybook
  • 🙅 no documentation needed

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

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

Copy link

netlify bot commented Nov 18, 2023

👷 Deploy request for docs-open pending review.

Visit the deploys page to approve it

Name Link
🔨 Latest commit b47356c

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR Compliance Checks

Thank you for your Pull Request! We have run several checks on this pull request in order to make sure it's suitable for merging into this project. The results are listed in the following section.

Issue Reference

In order to be considered for merging, the pull request description must refer to a specific issue number. This is described in our Contributing Guide.
This check is looking for a phrase similar to: "Fixes #XYZ" or "Resolves #XYZ" where XYZ is the issue number that this PR is meant to address.

@CBID2
Copy link
Contributor

CBID2 commented Nov 18, 2023

Hi @Lymah123. Can you merge the latest changes and resolve conflicts? If you need some help with that, check out this post: Keeping Your Branch Up to Date and Handling Merge Conflicts While Waiting for PR Reviews.

@CBID2 CBID2 added 💡 feature A label to note if work is a feature 📝 documentation labels Nov 18, 2023
@Lymah123
Copy link
Contributor Author

Hi @CBID2 , can I close the PR? I have tried the solutions in the blog, but nothing works. Though I have updated my branch,

@Lymah123
Copy link
Contributor Author

Screenshot (1366)

Hi, @CBID2 and @BekahHW. Check the screenshot. Do you think I can resolve the conflicts on my end?

@CBID2
Copy link
Contributor

CBID2 commented Nov 18, 2023

Screenshot (1366)

Hi, @CBID2 and @BekahHW. Check the screenshot. Do you think I can resolve the conflicts on my end?

@Lymah123, try this one: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-on-github

@BekahHW
Copy link
Member

BekahHW commented Nov 19, 2023

I had a PR merged in last week that's probably causing the conflicts. You'll need to update your branch with the latest changes.

@Lymah123 Lymah123 mentioned this pull request Nov 20, 2023
19 tasks
@Lymah123 Lymah123 closed this Nov 20, 2023
@Lymah123 Lymah123 deleted the adds-glossary branch November 20, 2023 23:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
📝 documentation 💡 feature A label to note if work is a feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants