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.

Sign up for GitHub

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

Jump to bottom

Fix merge-conflicts when adding multiple users through PRs #260

Closed
Andre601 opened this issue Nov 22, 2019 · 1 comment
Closed

Fix merge-conflicts when adding multiple users through PRs #260

Andre601 opened this issue Nov 22, 2019 · 1 comment
Labels
enhancement New feature or request

Comments

@Andre601
Copy link

This is moved from all-contributors/all-contributors#310 so please check this issue for general information about this enhancement-idea.

To summarize it:
When adding multiple users one by one, without merging the created PRs after adding can the PRs have merge-conflicts if you merge PR 1 and PR 2 is still open.
The bot should auto-fix those conflicts to allow merging.
@Andre601 Andre601 added the enhancement New feature or request label Nov 22, 2019
@Andre601 Andre601 mentioned this issue Nov 22, 2019
Closed
@Andre601 Andre601 mentioned this issue Dec 27, 2019
Closed
@Andre601
Copy link
Author

Merged into one major issue (#286)

@agilgur5 agilgur5 mentioned this issue Mar 9, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@Andre601