From df6b3f74930b1e6435d830000793e7a610c013b2 Mon Sep 17 00:00:00 2001
From: Henry Webel <heweb@dtu.dk>
Date: Thu, 6 Nov 2025 10:20:23 +0100
Subject: [PATCH 1/2] :memo: add instructions to globally or locally define how
 to handle diverging changes

Situation:
- local commits not on origin
- new commits on branch on origin
---
 local_setup.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/local_setup.md b/local_setup.md
index 14d0cf3..7f5bb6e 100644
--- a/local_setup.md
+++ b/local_setup.md
@@ -16,3 +16,18 @@ git config --global user.email "you@example.com"
 git config --global user.name "Your Name"
 ``` 
 > could be added to local config using `git config user...`
+
+Then you need to define how to handle merge conflicts, in case you have committed 
+changes locally and there are changes in the remote repository. The easiest way is to
+always create a merge commit 
+([docs](https://git-scm.com/docs/git-config#Documentation/git-config.txt-pullrebase)):
+
+```bash
+git config --global pull.rebase false
+# or only for this repository
+git config --local pull.rebase false
+```
+
+Setting it to true has a the warning: 
+> NOTE: (setting it to true) is a possibly dangerous operation; do not use it unless you understand 
+> the implications. (see [git-rebase](https://git-scm.com/docs/git-rebase) for details)

From 0b3d902044b4b7e98c41fb6b12aecad6eea54018 Mon Sep 17 00:00:00 2001
From: Henry Webel <heweb@dtu.dk>
Date: Thu, 6 Nov 2025 18:01:07 +0100
Subject: [PATCH 2/2] :memo: add recipe template to instructions

---
 instructions_251105.md | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/instructions_251105.md b/instructions_251105.md
index 27dd5d7..2c06f50 100644
--- a/instructions_251105.md
+++ b/instructions_251105.md
@@ -53,7 +53,31 @@ as well or instead. Find exercise groups seeing the marks on the tables.
 - [create a fork](https://github.com/biosustain/recipe-book/fork)
   (or request access as collaborator of the the recipe-repo)
 - create a new branch from `main`, e.g. `add-aioli-pasta`
-- create a commit with your new recipe draft
+- create a commit with your new recipe draft using the template
+  <details>
+  <summary>See the recipe template</summary>
+
+  ```markdown
+  # Title
+
+  ## Ingredients
+
+  (For 4 People)
+
+  - ingredient 1
+  - ingredient 2
+
+  ## Instructions
+
+  1. first step
+  2. second step
+
+  ```
+
+  Please make sure to have the headings as shown above for consistency.
+  It will be checked.
+
+  </details>
 - open a Pull (Merge) Request on GitHub to `origin/main`
 - ask someone (by inviting them) to review your PR and get an approval
   - I set-up the repo to require at least one approval before a merge is possible