Remove the git_conflict task #353
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
veewee
force-pushed
the
removal-git-conflict
branch
from
5241af2
to
1c2d87e
Compare
veewee
force-pushed
the
removal-git-conflict
branch
from
1c2d87e
to
8252f9c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
git_conflicttask never worked properly. After doing some investigation, it looks like git is doing this check out of the box. You won't be able to commit when there are unresolved conflicts. Therefor the task has no use and will be deletet.Don't worry: GrumPHP won't break with your old config!