start-here-guidelines icon indicating copy to clipboard operation
start-here-guidelines copied to clipboard

Testing

Open shreeentka opened this issue 1 year ago • 2 comments

I've tried to resolve the merge conflict .

shreeentka avatar May 17 '24 12:05 shreeentka

⚠️ MERGE CONFLICT DETECTED!

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

⚠️ MERGE CONFLICT DETECTED!

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

🙏 Thanks for your pull request @shreeentka, 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:
22460 3 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
1 2574 16925