$ git co master
$ cat .gitattributes
.htaccess merge=ours
$ cat .htaccess
php_flag display_startup_errors on

$ git co production
$ cat .htaccess
+Options -Indexes
$ git merge master
$ cat .htaccess
php_flag display_startup_errors on