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

Git compatibility: Should exit non-zero in case of merge conflicts #85

Closed
slarse opened this issue Mar 25, 2020 · 0 comments
Closed

Git compatibility: Should exit non-zero in case of merge conflicts #85

slarse opened this issue Mar 25, 2020 · 0 comments
Labels
enhancement New feature or request

Comments

@slarse
Copy link
Collaborator

slarse commented Mar 25, 2020

Spork should exit non-zero if there are conflicts in merge to be compatible with Git
@slarse slarse added bug Something isn't working enhancement New feature or request and removed bug Something isn't working labels Mar 25, 2020
@slarse slarse changed the title Exits with zero exit status even if there are conflicts Git compatibility: Should exit non-zero in case of merge conflicts Mar 26, 2020
@slarse slarse closed this as completed in 8c0f5d4 Mar 26, 2020
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
@slarse