Merge conflict

git merge driver for automatically merging lockfiles

2.3.6 • Published 4 years ago

git merge driver specific for Salesforce.com Metadata

0.1.7 • Published 3 years ago

git merge driver specific for Salesforce.com Metadata

0.1.29 • Published 3 years ago

git merge driver for automatically merging resx files

1.0.0 • Published 6 years ago

Gilp plugin to detect merge conflicts.

0.0.10 • Published 4 years ago

git merge driver for automatically merging lockfiles

2.3.7 • Published 4 years ago

Merge conflict Packages