Add a merge strategy for `VERSION` to automatically use EE version

See https://medium.com/@porteneuve/how-to-make-git-preserve-specific-files-while-merging-18c92343826b [ci skip]

Add a merge strategy for `VERSION` to automatically use EE version
See https://medium.com/@porteneuve/how-to-make-git-preserve-specific-files-while-merging-18c92343826b [ci skip]
26e5c136 · Robert Speicher · 554e2c37 · 26e5c136
Commit 26e5c136 authored Mar 12, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

.gitattributes .gitattributes +1 -0

No files found.
--- a/.gitattributes
+++ b/.gitattributes
+VERSION merge=ours