How to Resolve Merge Conflicts in DVC Metafiles, issue

[dyollb]

Report

The following command lines are suggested in the section How to Resolve Merge Conflicts in DVC Metafiles.

git config merge.dvc.name 'DVC merge driver'
git config merge.dvc.driver \
      'dvc git-hook merge-driver --ancestor %O --our %A --their %B'

On Windows cmd this just prints the help.

I guess a platform-independent command line would use double quotes:

git config merge.dvc.name "DVC merge driver"
git config merge.dvc.driver \
      "dvc git-hook merge-driver --ancestor %O --our %A --their %B"

[dberenbaum]

@dyollb Good catch! Would you be interested in submitting a PR to fix the docs?

[geeksambhu]

@dberenbaum Can I work on this?

[dberenbaum]

Yes, feel free @geeksambhu, thanks!