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

Handle merge conflicts #3

Open
7dev7urandom opened this issue Nov 15, 2021 · 0 comments
Open

Handle merge conflicts #3

7dev7urandom opened this issue Nov 15, 2021 · 0 comments
Labels
bug Something isn't working enhancement New feature or request

Comments

@7dev7urandom
Copy link
Member

Currently any merge conflict will throw an error and halt updates, requiring an organization admin to manually fix the issue. A better error message would be appropriate, and maybe some merge handling.
@7dev7urandom 7dev7urandom added bug Something isn't working enhancement New feature or request labels Nov 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug Something isn't working enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@7dev7urandom