You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by us...@apache.org on 2021/06/17 23:10:52 UTC
[solr-site] branch main 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 main
in repository https://gitbox.apache.org/repos/asf/solr-site.git
The following commit(s) were added to refs/heads/main by this push:
new 4ae59e4 Prevent merge of .asf.yaml control file
4ae59e4 is described below
commit 4ae59e4ed0101e4b40404d606ae8c29a36a43016
Author: Uwe Schindler <us...@apache.org>
AuthorDate: Fri Jun 18 01:10:41 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