0

I want to tell git that in case of conflict on a merge on a specific file he has to always use the remote version of the file.

The only thing I found was how to always keep the local version of the file: How do I tell git to always select my local version for conflicted merges on a specific file? and .gitattributes & individual merge strategy for a file

thanks

Community
  • 1
  • 1
Lou
  • 117
  • 1
  • 8

1 Answers1

1

Use merge -X theirs

See more details about the "theirs" merge strategy option: https://www.kernel.org/pub/software/scm/git/docs/git-merge.html

nicolasochem
  • 467
  • 4
  • 8