gulp-conflict

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