Browse by Keyword: "conflict"

Page 1

dont-commit-conflicts.hks stop contributors from commiting conflicts

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

sickmerge A git command-line conflict resolution tool. In the browser.

vectorclock A simple implementation of vector clocks in Javascript.

Page 1

npm loves you