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

Make spork comply with git merge-file by exiting with amount of merge conflicts #113

Closed
slarse opened this issue May 5, 2020 · 0 comments
Closed

Make spork comply with git merge-file by exiting with amount of merge conflicts #113

slarse opened this issue May 5, 2020 · 0 comments
Labels
enhancement New feature or request

Comments

@slarse
Copy link
Collaborator

slarse commented May 5, 2020

According to the spec, Spork should not only exit non-zero if there are merge conflicts, but it's exit status should in fact be the amount of conflicts, truncated to a maximum of 127.
@slarse slarse added the enhancement New feature or request label May 5, 2020
@slarse slarse closed this as completed in 14f733b May 12, 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