[lucene-site] branch master updated: Clarify merge strategy (#40)

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

janhoy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-site.git


The following commit(s) were added to refs/heads/master by this push:
     new 860014a  Clarify merge strategy (#40)
860014a is described below

commit 860014a288278c5e34e6dee33c95ef162a1e45ca
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Tue Feb 16 00:55:12 2021 +0100

    Clarify merge strategy (#40)
    
    * Clarify merge strategy for production. Allow merge commit from UI merge button
    * Protect branches master and production
---
 .asf.yaml | 7 +++++--
 README.md | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 794f42d..c7673d6 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -12,5 +12,8 @@ github:
     - pelican
   enabled_merge_buttons:
     squash: true
-    merge:  false
-    rebase: false
\ No newline at end of file
+    merge:  true
+    rebase: false
+  protected_branches:
+    master
+    production
diff --git a/README.md b/README.md
index a8fe2d2..3a18570 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,8 @@ The site is written in [Markdown][9] syntax and built into a static site using [
  
 If the staged site looks good, simply merge the changes to branch `production` and the site will be deployed in a minute or two. Note that simple edits can also be done directly in the GitHub UI rather than clone -> edit -> commit -> push.
 
+> **IMPORTANT**: Please never commit directly to `production` branch. All commits should go to master, and then merge master to production. Note that it **is** possible to make a Pull Request for the merge from `master-->production`. If you do so, please merge using a merge commit rather than a squash merge.
+
 For larger edits it is recommended to build and preview the site locally. This lets you see the result of your changes instantly without committing anything. The next sections detail that procedure. The TL;DR instructions goes like this:
 
     # Usage: ./build.sh [-l] [<other pelican arguments>]