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

Test #23212

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Test #23212

wants to merge 3 commits into from

Conversation

medula07
Copy link
Contributor

I've added my name to the list @achwell

Copy link
Contributor

⚠️ MERGE CONFLICT DETECTED!

@medula07 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
Contributor

⚠️ MERGE CONFLICT DETECTED!

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

-[@timthetech30](https://github.com/timthetech30)

-[@medula07](https://github.com/medula07)

Choose a reason for hiding this comment

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

Suggested change
-[@medula07](https://github.com/medula07)
- [@medula07](https://github.com/medula07)

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