Conflicts Packages

conflicts

Detects when a new file is different than an existing file and prompts the user for action.

1.1.2 • Published 5 years ago

check-diff-conflicts

checks diff between files and returns the file with the difference with comments to help solve the conflict

1.0.3 • Published 10 months ago