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

I delete the extra files and change the name of my JSON file as same my github username. #2864

Closed
wants to merge 0 commits into from

Conversation

Hamidmirzapour
Copy link
Contributor

I delete the extra files and change tha name of my json file as same mu github username. Please pull my request.

@zero-to-mastery-bot
Copy link

🙏 Thanks for your pull request @Hamidmirzapour, 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:
2864 16 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
1 935 2597

@zero-to-mastery-bot
Copy link

🙏 Thanks for your pull request @Hamidmirzapour, 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:
2864 16 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
1 935 2599

1 similar comment
@zero-to-mastery-bot
Copy link

🙏 Thanks for your pull request @Hamidmirzapour, 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:
2864 16 0
📑 Files Changed: Repo Stars: 🔱 Total Forks:
1 935 2599

@Hamidmirzapour
Copy link
Contributor Author

Please accept my pull request and merge my commits to main branch.

Thanks a lot.

@Hamidmirzapour
Copy link
Contributor Author

@dga Please check my request.

Copy link
Member

@ProsperousHeart ProsperousHeart left a comment

Choose a reason for hiding this comment

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

You appear to have conflicting files. I assume because you created a 2nd PR. Your original PR was already approved and does not look like this file.

You have 2 options:

  1. close this PR as your original one was the right one (ignoring the changes of this 2nd PR)
  2. pull down the main branch, merge into yours & fix issues, then push changes back up

@zero-to-mastery-bot
Copy link

⚠️ MERGE CONFLICT DETECTED!

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

2 similar comments
@zero-to-mastery-bot
Copy link

⚠️ MERGE CONFLICT DETECTED!

@Hamidmirzapour 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
Copy link

⚠️ MERGE CONFLICT DETECTED!

@Hamidmirzapour 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants