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: add entry about cherry-pick #3472

Merged
merged 17 commits into from Oct 20, 2023
Merged

feat: add entry about cherry-pick #3472

merged 17 commits into from Oct 20, 2023

Conversation

CBID2
Copy link
Contributor

@CBID2 CBID2 commented Oct 8, 2023

Description

This PR adds an entry about the cherry-pick command to the Git section. I've been using this command for a while, and it has helped me create a clean commit history. So, I feel new developers would benefit from learning this command.

Type of Change

Checklist

  • All writings are my own.
  • My entry follows the Codecademy Docs style guide.
  • My changes generate no new warnings.
  • I have performed a self-review of my own writing and code.
  • I have checked my entry and corrected any misspellings.
  • I have made corresponding changes to the documentation if needed.
  • I have confirmed my changes are not being pushed from my forked main branch.
  • I have confirmed that I'm pushing from a new branch named after the changes I'm making.
  • Under "Development" on the right, I have linked any issues that are relevant to this PR (write "Closes # in the "Description" above).

@CBID2
Copy link
Contributor Author

CBID2 commented Oct 8, 2023

@KTom101, can you help me with one of the tests? It's still failing in spite of placing the file and folder in the right section

@KTom101
Copy link
Collaborator

KTom101 commented Oct 8, 2023

@CBID2 I added a comment on where the error is occurring in the file.

@CBID2
Copy link
Contributor Author

CBID2 commented Oct 8, 2023

@CBID2 I added a comment on where the error is occurring in the file.

I don't see your comment @KTom101

@KTom101
Copy link
Collaborator

KTom101 commented Oct 8, 2023

@CBID2 You should be able to see it now!

@CBID2
Copy link
Contributor Author

CBID2 commented Oct 8, 2023

@CBID2 You should be able to see it now!

It worked @KTom101! :)

@KTom101
Copy link
Collaborator

KTom101 commented Oct 8, 2023

Great 👏

@CBID2
Copy link
Contributor Author

CBID2 commented Oct 8, 2023

Great 👏

Are you going to review it @KTom101? :)

@yangc95 yangc95 added git Git entries new entry New entry or entries labels Oct 9, 2023
Copy link
Collaborator

@KTom101 KTom101 left a comment

Choose a reason for hiding this comment

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

@CBID2 I added a few changes.

content/git/concepts/cherry-pick/cherry-pick.md Outdated Show resolved Hide resolved
content/git/concepts/cherry-pick/cherry-pick.md Outdated Show resolved Hide resolved
@CBID2
Copy link
Contributor Author

CBID2 commented Oct 9, 2023

I made the changes @KTom101. I already created a section about the --no commit option so I decided to only focus on the edit and signoff ones in the Syntax section.

@CBID2 CBID2 requested a review from KTom101 October 9, 2023 02:18
Copy link
Collaborator

@KTom101 KTom101 left a comment

Choose a reason for hiding this comment

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

Added a couple more changes

content/git/concepts/cherry-pick/cherry-pick.md Outdated Show resolved Hide resolved
content/git/concepts/cherry-pick/cherry-pick.md Outdated Show resolved Hide resolved
CBID2 and others added 3 commits October 8, 2023 23:31
Co-authored-by: Kyra Thompson <kyrathompson@me.com>
Co-authored-by: Kyra Thompson <kyrathompson@me.com>
@CBID2
Copy link
Contributor Author

CBID2 commented Oct 9, 2023

Added a couple more changes

Done @KTom101! :)

Copy link
Collaborator

@KTom101 KTom101 left a comment

Choose a reason for hiding this comment

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

@CBID2 I've added one more minor change, but I will pass this on for a second review.

content/git/concepts/cherry-pick/cherry-pick.md Outdated Show resolved Hide resolved
Co-authored-by: Kyra Thompson <kyrathompson@me.com>
@CBID2
Copy link
Contributor Author

CBID2 commented Oct 9, 2023

@CBID2 I've added one more minor change, but I will pass this on for a second review.

Done @KTom101

Copy link
Collaborator

@KTom101 KTom101 left a comment

Choose a reason for hiding this comment

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

Add line breaks too

content/git/concepts/cherry-pick/cherry-pick.md Outdated Show resolved Hide resolved
Co-authored-by: Kyra Thompson <kyrathompson@me.com>
@yangc95 yangc95 self-assigned this Oct 9, 2023
@yangc95 yangc95 added status: under review Issue or PR is currently being reviewed and removed status: ready for next review labels Oct 9, 2023
CBID2 and others added 2 commits October 9, 2023 16:22
Co-authored-by: Christine Yang <72277593+yangc95@users.noreply.github.com>
@CBID2
Copy link
Contributor Author

CBID2 commented Oct 9, 2023

Done @yangc95

@CBID2 CBID2 requested a review from yangc95 October 10, 2023 02:42
@KTom101
Copy link
Collaborator

KTom101 commented Oct 20, 2023

@CBID2 I made a change to the title here. Since all changes have been met, it looks good to merge.

@KTom101 KTom101 merged commit 7e6128b into Codecademy:main Oct 20, 2023
6 checks passed
@github-actions
Copy link

👋 @CBID2
You have contributed to Codecademy Docs, and we would like to know more about you and your experience.
Please take a minute to fill out this four question survey to help us better understand Docs contributions and how we can improve the experience for you and our learners.
Thank you for your help!

🎉 Your contribution(s) can be seen here:

https://www.codecademy.com/resources/docs/git/cherry-pick

Please note it may take a little while for changes to become visible.
If you're appearing as anonymous and want to be credited, see here.

@KTom101 KTom101 added hacktoberfest hacktoberfest-accepted Indicates the PR was approved, merged, and pertains to Hacktoberfest and removed status: under review Issue or PR is currently being reviewed labels Oct 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
git Git entries hacktoberfest hacktoberfest-accepted Indicates the PR was approved, merged, and pertains to Hacktoberfest new entry New entry or entries status: review 1️⃣ completed status: sme review 1️⃣ completed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Entry] Subject: Cherry-Pick
3 participants