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

adding my animation art #2539

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

shay122990
Copy link

No description provided.

Copy link

🥳 Congratulations 🎉

Congrats on making your first Pull Request in the Zero To Mastery Organization!
You have been sent an invitation to join the ZTM github organization, please check your emails for further details!

ZTM Profile Badge

If you'd like the ZTM Badge to show up on your profile, you will need to follow this guide!

@zero-to-mastery-bot zero-to-mastery-bot bot added the Conflict Present There is a conflict that can't be resolved in the web editor and must be resolved by the user. label Apr 22, 2024
Copy link

⚠️ MERGE CONFLICT DETECTED!

@shay122990 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!

@shay122990 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Conflict Present There is a conflict that can't be resolved in the web editor and must be resolved by the user.
Projects
None yet
1 participant