search

zero-to-mastery / start-here-guidelines

Lets Git started in the world of opensource, starting in the Zero To Mastery's opensource playground. Especially designed for education and practical experience purposes.
2.65k stars 17.14k forks source link

added my name to contributor list #22941

Closed shrlaw closed 4 days ago

shrlaw commented 4 days ago

I added my name to the contributor list. @aneagoie

zero-to-mastery-bot[bot] commented 4 days ago

⚠️ MERGE CONFLICT DETECTED!

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

zero-to-mastery-bot[bot] commented 4 days ago

⚠️ MERGE CONFLICT DETECTED!

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