Closed r4pt0s closed 3 years ago
@r4pt0s 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, there are tons of guides on Google and Youtube to help you out. If you get stuck ask over on Discord.
🙏 Thanks for your pull request @r4pt0s, 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 Number: | ➕ Line Additions: | 🗑️ Line Deletions: |
---|---|---|
35 | 859 | 6201 |
📑 Files Changed: | ⭐ Repo Stars: | 🔱 Total Forks: |
---|---|---|
20 | 14 | 27 |
🙏 Thanks for your pull request @r4pt0s, 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 Number: | ➕ Line Additions: | 🗑️ Line Deletions: |
---|---|---|
35 | 859 | 6201 |
📑 Files Changed: | ⭐ Repo Stars: | 🔱 Total Forks: |
---|---|---|
20 | 14 | 27 |
⚠️ MERGE CONFLICT DETECTED!
@r4pt0s 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, there are tons of guides on Google and Youtube to help you out. If you get stuck ask over on Discord.