Facility to change default choice on conflict (e.g. skip, diff)

slushjs / gulp-conflict

Check if files in stream conflict with those in target dir, with option to use new, keep old, show diff, etc.

MIT License

22 stars 12 forks source link

Facility to change default choice on conflict (e.g. skip, diff) #7

Closed dkavassy closed 9 years ago

dkavassy commented 9 years ago

In our projects, we ended up accidentally overwriting important custom changes with slush on conflicts. To prevent this from happening in the future, we would like to make 'diff' the default option. The above pull request would help us achieve this - and it may be useful for anyone using slush.

joakimbeng commented 9 years ago

Nice!