You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2021/06/17 23:05:45 UTC
[lucene-site] branch production updated: Prevent merge of .asf.yaml
control file
This is an automated email from the ASF dual-hosted git repository.
uschindler pushed a commit to branch production
in repository https://gitbox.apache.org/repos/asf/lucene-site.git
The following commit(s) were added to refs/heads/production by this push:
new fc079ee Prevent merge of .asf.yaml control file
fc079ee is described below
commit fc079ee3dfe1e993c70a94354c4189b9062fe3d5
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Fri Jun 18 01:03:26 2021 +0200
Prevent merge of .asf.yaml control file
---
.gitattributes | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..6f456b8
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Don't merge the ASF config file, which has details about THIS branch:
+.asf.yaml merge=ours