search

stevegrunwell / smee

ABANDONED: Please use https://github.com/BrainMaestro/composer-git-hooks instead! Library for automatically copying Git hooks into a project.
MIT License
2 stars 0 forks source link

Handle merging of Git hooks #1

Open stevegrunwell opened 6 years ago

stevegrunwell commented 6 years ago

If a hook is already present in a repository, the user should be prompted how they'd like to proceed (overwrite, ignore, or merge).

Work has begun on this in the feature/merge-hooks branch.

stevegrunwell commented 6 years ago

As of #13, we have a workflow for handling conflicts, but it does not yet handle merging two hooks (it merely shows a diff and allows the user to skip or overwrite).

Leaving this ticket open as a future feature, but removing it from the 1.0.0 milestone.