Skip to content

Latest commit

 

History

History
11 lines (9 loc) · 363 Bytes

git_conflict.md

File metadata and controls

11 lines (9 loc) · 363 Bytes

Git Conflict

The Git Conflict task gives you the power to never commit a merge conflict again. It uses internal git commands to determine if there are any merge conflicts in your current repository. It lives under the git_conflict namespace and has following configurable parameters:

# grumphp.yml
parameters:
    tasks:
        git_conflict: ~