search

open-sauced / pizza-verse

A repository for all things pizza.
MIT License
38 stars 55 forks source link

Feature/add pizza fact #82

Closed prw760 closed 3 months ago

prw760 commented 3 months ago

Description

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

Related Tickets & Documents

Added to documentation?

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

adiati98 commented 3 months ago

Hi @paulrwade,

We want to have one PR for one issue. And you have two issues that you work on in this PR.

That said, can you please revert your commit to change the image on the README? Also because it's been worked on by another contributor.

You can read this article to revert your commit.

If you find it overwhelming, you can close this PR and create a new one. But you need to do it from scratch by creating a new branch from the main branch.

Please let me know if you have questions or need any help!

prw760 commented 3 months ago

Hi, Ayu. Thanks again for all your help.

I did a git revert on the logo-update change to README.

I certainly hope I did it correctly. Can you please double-check?

Thanks for helping me to learn this.

Sent with Proton Mail secure email.

On Tuesday, May 7th, 2024 at 1:58 PM, Ayu Adiati @.***> wrote:

Hi @.***(https://github.com/paulrwade),

We want to have one PR for one issue. And you have two issues that you work on in this PR.

That said, can you please revert your commit to change the image on the README? Also because it's been worked on by another contributor.

You can read this article to revert your commit.

If you find it overwhelming, you can close this PR and create a new one. But you need to do it from scratch by creating a new branch from the main branch.

Please let me know if you have questions or need any help!

— Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you were mentioned.Message ID: @.***>

adiati98 commented 3 months ago

Hi, Ayu. Thanks again for all your help. I did a git revert on the logo-update change to README. I certainly hope I did it correctly. Can you please double-check? Thanks for helping me to learn this. Sent with Proton Mail secure email. … On Tuesday, May 7th, 2024 at 1:58 PM, Ayu Adiati @.> wrote: Hi @.(https://github.com/paulrwade), We want to have one PR for one issue. And you have two issues that you work on in this PR. That said, can you please revert your commit to change the image on the README? Also because it's been worked on by another contributor. You can read this article to revert your commit. If you find it overwhelming, you can close this PR and create a new one. But you need to do it from scratch by creating a new branch from the main branch. Please let me know if you have questions or need any help! — Reply to this email directly, [view it on GitHub](#82 (comment)), or unsubscribe. You are receiving this because you were mentioned.Message ID: @.***>

I haven't seen it changed, @paulrwade. Have you pushed your changes?

prw760 commented 3 months ago

I check the opensauce/pizza-verse and confirmed that my PR is cancelled. I ran a revert on my fork paulrwade/pizza-verse and pushed it to my fork. I then checked that the README file in the opensauce/pizza-verse fork contained the original logo and none of my changes.

Your thoughts?

Sent with Proton Mail secure email.

On Tuesday, May 7th, 2024 at 2:36 PM, Ayu Adiati @.***> wrote:

Hi, Ayu. Thanks again for all your help. I did a git revert on the logo-update change to README. I certainly hope I did it correctly. Can you please double-check? Thanks for helping me to learn this. Sent with Proton Mail secure email. … On Tuesday, May 7th, 2024 at 1:58 PM, Ayu Adiati @.> wrote: Hi @.(https://github.com/paulrwade), We want to have one PR for one issue. And you have two issues that you work on in this PR. That said, can you please revert your commit to change the image on the README? Also because it's been worked on by another contributor. You can read this article to revert your commit. If you find it overwhelming, you can close this PR and create a new one. But you need to do it from scratch by creating a new branch from the main branch. Please let me know if you have questions or need any help! — Reply to this email directly, [view it on GitHub](#82 (comment)), or unsubscribe. You are receiving this because you were mentioned.Message ID: @.***>

I haven't seen it changed, @.***(https://github.com/paulrwade). Have you pushed your changes?

— Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you were mentioned.Message ID: @.***>

adiati98 commented 3 months ago

I check the opensauce/pizza-verse and confirmed that my PR is cancelled. I ran a revert on my fork paulrwade/pizza-verse and pushed it to my fork. I then checked that the README file in the opensauce/pizza-verse fork contained the original logo and none of my changes. Your thoughts? Sent with Proton Mail secure email. … On Tuesday, May 7th, 2024 at 2:36 PM, Ayu Adiati @.> wrote: > Hi, Ayu. Thanks again for all your help. I did a git revert on the logo-update change to README. I certainly hope I did it correctly. Can you please double-check? Thanks for helping me to learn this. Sent with Proton Mail secure email. > … > On Tuesday, May 7th, 2024 at 1:58 PM, Ayu Adiati @.> wrote: Hi @.(https://github.com/paulrwade), We want to have one PR for one issue. And you have two issues that you work on in this PR. That said, can you please revert your commit to change the image on the README? Also because it's been worked on by another contributor. You can read this article to revert your commit. If you find it overwhelming, you can close this PR and create a new one. But you need to do it from scratch by creating a new branch from the main branch. Please let me know if you have questions or need any help! — Reply to this email directly, [view it on GitHub]([#82 (comment)](#82 (comment))), or unsubscribe. You are receiving this because you were mentioned.Message ID: @.> I haven't seen it changed, @.(https://github.com/paulrwade). Have you pushed your changes? — Reply to this email directly, [view it on GitHub](#82 (comment)), or unsubscribe. You are receiving this because you were mentioned.Message ID: @.>

Can you confirm your current branch? Are you at feature/add_pizza_fact branch? You need to be in this branch to revert your commit.

prw760 commented 3 months ago

I will delete the other PR from where I added to the pizza trivia.

Here is my revert. Don't know why you keep seeing the logo change in the code after I reverted it.

[image.png]

On Tuesday, May 7th, 2024 at 2:49 PM, Ayu Adiati @.***> wrote:

@adiati98 commented on this pull request.

In README.md:

@@ -1,6 +1,6 @@


- Open Sauced + Open Sauced

There is no new commit from you.

After you did git revert, you need to:

  • add and commit your changes with git add and git commit
  • push them to your remote branch with git push.

— Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you were mentioned.Message ID: @.***>

prw760 commented 3 months ago

I was in the wrong branch. I just went ahead and got rid of both of my PRs.

At this point, the opensauced/pizza-verse repo shouldn't have been affected, correct?

I will be more careful about what branch I'm working on. I see now how my second PR inadvertently ALSO included the edited README file. My bad.

Sent with Proton Mail secure email.

On Tuesday, May 7th, 2024 at 2:57 PM, Ayu Adiati @.***> wrote:

I check the opensauce/pizza-verse and confirmed that my PR is cancelled. I ran a revert on my fork paulrwade/pizza-verse and pushed it to my fork. I then checked that the README file in the opensauce/pizza-verse fork contained the original logo and none of my changes. Your thoughts? Sent with Proton Mail secure email. … On Tuesday, May 7th, 2024 at 2:36 PM, Ayu Adiati @.> wrote: > Hi, Ayu. Thanks again for all your help. I did a git revert on the logo-update change to README. I certainly hope I did it correctly. Can you please double-check? Thanks for helping me to learn this. Sent with Proton Mail secure email. > … > On Tuesday, May 7th, 2024 at 1:58 PM, Ayu Adiati @.> wrote: Hi @.(https://github.com/paulrwade), We want to have one PR for one issue. And you have two issues that you work on in this PR. That said, can you please revert your commit to change the image on the README? Also because it's been worked on by another contributor. You can read this article to revert your commit. If you find it overwhelming, you can close this PR and create a new one. But you need to do it from scratch by creating a new branch from the main branch. Please let me know if you have questions or need any help! — Reply to this email directly, [view it on GitHub]([#82 (comment)](#82 (comment))), or unsubscribe. You are receiving this because you were mentioned.Message ID: @.> I haven't seen it changed, @.(https://github.com/paulrwade). Have you pushed your changes? — Reply to this email directly, [view it on GitHub](#82 (comment)), or unsubscribe. You are receiving this because you were mentioned.Message ID: @.>

Can you confirm your current branch? Are you at feature/add_pizza_fact branch? You need to be in this branch to revert your commit.

— Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you were mentioned.Message ID: @.***>

adiati98 commented 3 months ago

@paulrwade because you said that you've pushed the changes to revert your commit, when I see that it doesn't get through here, I'm pretty sure that you are on another branch. That's why I want to confirm if you are on this branch.

I saw now that you've made change directly on the main branch in your other closed PR. FYI, you always want to create a new branch before you work on your changes. Changes that are made directly on the main branch would not be accepted in any open source project because it can cause problems.

You can read this blog post for further information. :)

Answering your below question:

At this point, the opensauced/pizza-verse repo shouldn't have been affected, correct?

It doesn't affect the repo because we don't merge the PRs.

adiati98 commented 3 months ago

I see now how my second PR inadvertently ALSO included the edited README file

This happens because you first made changes directly on the main branch. Then, after you made the changes on the main branch, you create a new branch.

So, your first changes got carried on to this new branch.

This is one of the reasons why we don't want to mess with main branch. 😊

Tips: When you want to create a new branch, always create it from the default (usually main) branch. Don't create a new branch from any of your working branch.