This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/master by this push:
new 175851b Use merge=union strategy to avoid false merge conflicts on
CalciteResource.properties
175851b is described below
commit 175851b033bc94d3df0e883839b4be6ed8405d19
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Thu Sep 3 02:09:27 2020 +0300
Use merge=union strategy to avoid false merge conflicts on
CalciteResource.properties
merge=union avoid merge conflicts by selecting the union of the lines.
It might result in duplicate lines if different commits edit the same
line, however, it is unlikely case for CalciteResources.
---
.gitattributes | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitattributes b/.gitattributes
index ecbb145..c1b84ca 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -26,3 +26,9 @@ data/files/*.dat text eol=lf
*.cmd text eol=crlf
*.csproj text merge=union eol=crlf
*.sln text merge=union eol=crlf
+
+# Take the union of the lines during merge
+# It avoids false merge conflicts when different lines are added close to each
other
+# However, it might result in duplicate lines if two commits edit the same
line differently.
+# If different commits add exactly the same line, then merge produces only one
line.
+/core/src/main/resources/org/apache/calcite/runtime/CalciteResource.properties
text merge=union
