Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

set merge strategy to binary for autogenerated files (#5058)

This commit is contained in:
Wilfried Goesgens 2018-04-24 16:12:53 +02:00 committed by Jan
parent 7d6e580780
commit 5435be2362
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitattributes vendored
View File

@ -11,4 +11,5 @@ VERSION merge=ours
STARTER_REV merge=ours
lib/V8/v8-json.cpp merge=ours
arangod/Aql/tokens.cpp merge=ours
arangod/Aql/grammar.cpp merge=ours
arangod/Aql/grammar.cpp merge=ours
js/apps/system/_admin/aardvark/APP/api-docs.json merge=ours

7
README_maintainers.md
View File

@ -5,6 +5,13 @@ ArangoDB Maintainers manual
This file contains documentation about the build process and unittests - put short - if you want to hack parts of arangod this could be interesting for you.
Documentation readme can be found in directory [Documentation](https://github.com/arangodb/arangodb/blob/devel/Documentation/README_maintainers.md).
GIT
===
Setting up git for automatically merging certain automatically generated files in the arangodb source tree:
git config --global merge.ours.driver true
CMake
=====