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

feature: added dining room table interaction #189

Merged
merged 3 commits into from
Oct 29, 2024

Conversation

nishchalgv1
Copy link
Contributor

@nishchalgv1 nishchalgv1 commented Oct 28, 2024

Added dining room table interaction

Part of #130

Copy link

⚠️ MERGE CONFLICT DETECTED!

@nishchalgv1 A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

Copy link

⚠️ MERGE CONFLICT DETECTED!

@nishchalgv1 A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

1 similar comment
Copy link

⚠️ MERGE CONFLICT DETECTED!

@nishchalgv1 A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

Copy link

🙏 Thanks for your pull request @nishchalgv1, The team will now review and merge this request. In the mean time why not check out some of the other opensource projects available, contributions are greatly appreciated!

Some of the most popular are


PR Statistics

#️⃣ PR Number: Line Additions: 🗑️ Line Deletions:
189 17 5
📑 Files Changed: Repo Stars: 🔱 Total Forks:
2 27 93

1 similar comment
Copy link

🙏 Thanks for your pull request @nishchalgv1, The team will now review and merge this request. In the mean time why not check out some of the other opensource projects available, contributions are greatly appreciated!

Some of the most popular are


PR Statistics

#️⃣ PR Number: Line Additions: 🗑️ Line Deletions:
189 17 5
📑 Files Changed: Repo Stars: 🔱 Total Forks:
2 27 93

@nishchalgv1 nishchalgv1 marked this pull request as ready for review October 28, 2024 18:53
Copy link

🙏 Thanks for your pull request @nishchalgv1, The team will now review and merge this request. In the mean time why not check out some of the other opensource projects available, contributions are greatly appreciated!

Some of the most popular are


PR Statistics

#️⃣ PR Number: Line Additions: 🗑️ Line Deletions:
189 17 5
📑 Files Changed: Repo Stars: 🔱 Total Forks:
2 27 93

@r4pt0s
Copy link
Collaborator

r4pt0s commented Oct 29, 2024

@nishchalgv1 can you please resolve the merge conflict 🙏🏻?

Copy link

🙏 Thanks for your pull request @nishchalgv1, The team will now review and merge this request. In the mean time why not check out some of the other opensource projects available, contributions are greatly appreciated!

Some of the most popular are


PR Statistics

#️⃣ PR Number: Line Additions: 🗑️ Line Deletions:
189 17 4
📑 Files Changed: Repo Stars: 🔱 Total Forks:
2 27 93

@nishchalgv1
Copy link
Contributor Author

@nishchalgv1 can you please resolve the merge conflict 🙏🏻?

Resolved. Please let me know if further blockers exist.

Copy link
Collaborator

@r4pt0s r4pt0s left a comment

Choose a reason for hiding this comment

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

🔥🔥🔥

@r4pt0s r4pt0s merged commit 30dcb48 into zero-to-mastery:main Oct 29, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants