sfdc-mergetool
==============

Merge salesforce metadata with ease


Usage

$3

Add the following lines to your ~/.gitconfig file

``
[merge "sfdcm"]
name = Merge Driver for Salesforce Metadata
driver = sfdcm %O %A %B %P
`

$3


Add the following to your gitattributes file. This can be your /.gitattributes or /.git/info/attributes files

`
*.object merge=sfdcm
*.profile merge=sfdcm
*.assignmentRules merge=sfdcm
*.sharingRules merge=sfdcm
*.permissionset merge=sfdcm
*.workflow merge=sfdcm
*.objectTranslations merge=sfdcm
*.translations merge=sfdcm
*.labels merge=sfdcm
*.standardValueSet merge=sfdcm
*.globalValueSet merge=sfdcm
`

Commands

Test your tool is installed
sfdcm --version`