diff --git a/.gitignore b/.gitignore
index 700671828..a4335524f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,6 @@ locale/
 /gameshell*
 game shell*
 boxes-data.awk
+*.swp
+game_dev
+al_far_repo
diff --git a/missions/contrib/git_advanced/01_sshkey/_clean.sh b/missions/contrib/git_advanced/01_sshkey/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_advanced/01_sshkey/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_advanced/01_sshkey/_test.sh b/missions/contrib/git_advanced/01_sshkey/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_advanced/01_sshkey/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/01_sshkey/_treasure-msg.txt b/missions/contrib/git_advanced/01_sshkey/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_advanced/01_sshkey/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_advanced/01_sshkey/_treasure.sh b/missions/contrib/git_advanced/01_sshkey/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_advanced/01_sshkey/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_advanced/01_sshkey/auto.sh b/missions/contrib/git_advanced/01_sshkey/auto.sh
new file mode 100644
index 000000000..f5a8ee6f9
--- /dev/null
+++ b/missions/contrib/git_advanced/01_sshkey/auto.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+url=$(LANG=GB git remote show origin | grep "Push  URL" | tr -s ' ' | cut -d ' ' -f 4)
+git remote set-url origin git@plmlab.math.cnrs.fr:gameshell_git/al_jeit.git
+gsh check
+# Put URL back in case we are working on a local remote
+git remote set-url origin $url
diff --git a/missions/contrib/git_advanced/01_sshkey/check.sh b/missions/contrib/git_advanced/01_sshkey/check.sh
new file mode 100644
index 000000000..3ff852093
--- /dev/null
+++ b/missions/contrib/git_advanced/01_sshkey/check.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  # verifier que le repertoire existe et est un depot git
+  
+ if [ ! -d "$GSH_HOME/Castle/Portals/spellbook" ]
+    then 
+      echo " The repository spellbook doesn't exist"
+      return 1
+    else
+    echo " The repository spellbook  exist"
+    fi
+
+  if [ ! -d $GSH_HOME/Castle/Portals/spellbook/.git ]
+    then 
+      echo " The repository spellbook is not a git repository"
+      return 1
+    else
+      echo " The repository spellbook is a git repository"
+  fi
+   
+  cd $GSH_HOME/Castle/Portals/spellbook
+   
+  LANG=en_GB git remote show origin | grep git@
+
+
+  test=$(echo $?)
+          
+  if [ $test -eq 1 ]
+    then 
+      echo " you did not changed to SSH URL"
+      return 1
+  fi
+  
+    return 0 
+}
+_mission_check
diff --git a/missions/contrib/git_advanced/01_sshkey/clean.sh b/missions/contrib/git_advanced/01_sshkey/clean.sh
new file mode 120000
index 000000000..614a72e95
--- /dev/null
+++ b/missions/contrib/git_advanced/01_sshkey/clean.sh
@@ -0,0 +1 @@
+../../git_basics/00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_advanced/01_sshkey/goal.txt b/missions/contrib/git_advanced/01_sshkey/goal.txt
new file mode 100644
index 000000000..26f89c56d
--- /dev/null
+++ b/missions/contrib/git_advanced/01_sshkey/goal.txt
@@ -0,0 +1,27 @@
+Mission goal
+============
+
+According to the Head of the Magic Concil, some spellbooks have been altered in the past, due to avoidable mistakes. 
+
+The Head of the magic council has then sent an emmissary to your castle with an urgent request: all spells created from now on should be put on the SpellBook library (Github, gitlab...) and older ones sitting in Libraries also.
+
+When you arrived as a wizzard in your current Castle, the previous wizzard left a few spells he was working on, without synchronizing them with the SpellBook Library
+
+Saving the spell of the previous wizzard without the need of creating a spell yourself is a good training.
+
+
+
+The first step as a wizard is to craft your pair of rings (public and private ssh keys) that will allow you to authenticate without login/password to the remote repository.
+
+1. Create your pair of rings (ssh key)
+2. Upload it on your account on the interdimensional library (the remote repository git.univ-pau.fr).
+
+
+Useful commands
+===============
+
+Some instructions on how to create an ssh key:
+firefox https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent
+
+NB: in our case, we will let the passphrase empty, so no need to setup the ssh agent
+Then you can either :
diff --git a/missions/contrib/git_advanced/01_sshkey/init.sh b/missions/contrib/git_advanced/01_sshkey/init.sh
new file mode 100644
index 000000000..6f57e56bc
--- /dev/null
+++ b/missions/contrib/git_advanced/01_sshkey/init.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_advanced/01_sshkey/static.sh b/missions/contrib/git_advanced/01_sshkey/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_advanced/01_sshkey/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/02_git_mv/_clean.sh b/missions/contrib/git_advanced/02_git_mv/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_advanced/02_git_mv/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_advanced/02_git_mv/_test.sh b/missions/contrib/git_advanced/02_git_mv/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_advanced/02_git_mv/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/02_git_mv/_treasure-msg.txt b/missions/contrib/git_advanced/02_git_mv/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_advanced/02_git_mv/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_advanced/02_git_mv/_treasure.sh b/missions/contrib/git_advanced/02_git_mv/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_advanced/02_git_mv/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_advanced/02_git_mv/auto.sh b/missions/contrib/git_advanced/02_git_mv/auto.sh
new file mode 100644
index 000000000..1569cf6b2
--- /dev/null
+++ b/missions/contrib/git_advanced/02_git_mv/auto.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+mkdir Chapter_1
+git mv truth_spell glowing_finger_spell Chapter_1/
+git commit -m "moving spell into Chapter_1"
+git push
+gsh check
diff --git a/missions/contrib/git_advanced/02_git_mv/check.sh b/missions/contrib/git_advanced/02_git_mv/check.sh
new file mode 100644
index 000000000..4f2971fc9
--- /dev/null
+++ b/missions/contrib/git_advanced/02_git_mv/check.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  if [ ! -e "$GSH_HOME/Castle/Portals/spellbook/Chapter_1/glowing_finger_spell" ]
+  then 
+    echo " The file  glowing_finger_spell is not in Chapter_1"
+    return 1
+  else
+    echo " The file  glowing_finger_spell  is in Chapter_1"
+  fi
+
+  if [ ! -e "$GSH_HOME/Castle/Portals/spellbook/Chapter_1/truth_spell" ]
+  then 
+    echo " The file  truth_spell is not in Chapter_1"
+    return 1
+  else
+    echo " The file  truth_spell is in Chapter_1"
+  fi
+
+
+  # verifier que le repertoire existe et est un depot git
+  cd $GSH_HOME/Castle/Portals/spellbook/
+
+  # verif que tous les fichiers sont suivis
+  LANG=en_GB git status | grep -e "Untracked"
+
+  test=$(echo $?)
+
+  if [ $test -eq 0 ]
+  then 
+    echo "You should not have untracked file."
+    return 1
+  fi
+
+  # verif que aucune modif ne traine dans la copie de travail
+  LANG=en_GB git status | grep -e "Changes not staged for commit:"
+
+  test=$(echo $?)
+
+  if [ $test -eq 0 ]
+  then 
+    echo "You still have changes in your working directory. Everything should be committed, no change should remain."
+    return 1
+  fi
+
+
+
+  LANG=en_GB git status | grep -e "up to date with"
+  test=$(echo $?)
+
+  if [ $test -eq 1 ]
+  then 
+    echo " You did not push all of your modifications."
+    return 1
+  else
+    cd $GSH_HOME/Castle/Portals/spellbook/
+
+    LANG=en_GB git status | grep -e "Changes to be committed:"
+    test=$(echo $?)
+
+    if [ $test -eq 0 ]
+    then 
+      echo " You did not commit all of your modifications"
+      return 1
+    else 
+      echo " You did push all of your modifications"
+      return 0 
+    fi
+  fi
+
+}
+_mission_check
diff --git a/missions/contrib/git_advanced/02_git_mv/clean.sh b/missions/contrib/git_advanced/02_git_mv/clean.sh
new file mode 120000
index 000000000..614a72e95
--- /dev/null
+++ b/missions/contrib/git_advanced/02_git_mv/clean.sh
@@ -0,0 +1 @@
+../../git_basics/00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_advanced/02_git_mv/goal.txt b/missions/contrib/git_advanced/02_git_mv/goal.txt
new file mode 100644
index 000000000..253b0576c
--- /dev/null
+++ b/missions/contrib/git_advanced/02_git_mv/goal.txt
@@ -0,0 +1,28 @@
+Mission goal
+============
+
+It can be convenient to make chapters for your spells. 
+
+Create a First Chapter (called Chapter_1) and move your two spells into that folder.
+
+This can be done along with a stagged synchronisation.
+
+Warning: do not forget to create the directory before moving files !
+
+
+Useful commands
+===============
+
+git add FOLDER_NAME
+
+git mv FILE_NAME FOLDER_NAME/
+
+git status
+
+git commit -m "moving spell into Chapter_1"
+
+git push
+
+
+
+
diff --git a/missions/contrib/git_advanced/02_git_mv/init.sh b/missions/contrib/git_advanced/02_git_mv/init.sh
new file mode 100644
index 000000000..a002b5b87
--- /dev/null
+++ b/missions/contrib/git_advanced/02_git_mv/init.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git reset --hard origin/truth_spell_added &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_advanced/02_git_mv/static.sh b/missions/contrib/git_advanced/02_git_mv/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_advanced/02_git_mv/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/03_edit_commit_push_Readme/_clean.sh b/missions/contrib/git_advanced/03_edit_commit_push_Readme/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_advanced/03_edit_commit_push_Readme/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_advanced/03_edit_commit_push_Readme/_test.sh b/missions/contrib/git_advanced/03_edit_commit_push_Readme/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_advanced/03_edit_commit_push_Readme/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/03_edit_commit_push_Readme/_treasure-msg.txt b/missions/contrib/git_advanced/03_edit_commit_push_Readme/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_advanced/03_edit_commit_push_Readme/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_advanced/03_edit_commit_push_Readme/_treasure.sh b/missions/contrib/git_advanced/03_edit_commit_push_Readme/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_advanced/03_edit_commit_push_Readme/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_advanced/03_edit_commit_push_Readme/auto.sh b/missions/contrib/git_advanced/03_edit_commit_push_Readme/auto.sh
new file mode 100644
index 000000000..15189724a
--- /dev/null
+++ b/missions/contrib/git_advanced/03_edit_commit_push_Readme/auto.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+echo "Glowing finger and Truth spells" >> README.md 
+git commit -am "README updated"
+git push 
+gsh check
diff --git a/missions/contrib/git_advanced/03_edit_commit_push_Readme/check.sh b/missions/contrib/git_advanced/03_edit_commit_push_Readme/check.sh
new file mode 100644
index 000000000..7056d6abe
--- /dev/null
+++ b/missions/contrib/git_advanced/03_edit_commit_push_Readme/check.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+  cd $GSH_HOME/Castle/Portals/spellbook/
+
+LANG=en_GB git status | grep -e "Untracked"
+ 
+  test=$(echo $?)
+          
+  if [ $test -eq 0 ]
+    then 
+      echo " you not have untracked file"
+      return 1
+  fi
+  
+
+LANG=en_GB git status | grep -e "modified"
+ 
+  test=$(echo $?)
+          
+  if [ $test -eq 0 ]
+    then 
+      echo " you a modified file"
+      return 1
+  fi
+  
+  
+
+    LANG=en_GB git status | grep -e "up to date with"
+test=$(echo $?)
+          
+  if [ $test -eq 1 ]
+    then 
+      echo " You did not pushed all of your modifications"
+      return 1
+    else
+      cd $GSH_HOME/Castle/Portals/spellbook/
+
+       LANG=en_GB git status | grep -e "Changes to be committed:"
+       test=$(echo $?)
+      
+       if [ $test -eq 0 ]
+          then 
+            echo " You did not commited all of your modifications"
+            return 1
+         else 
+           echo " You did pushed all of your modifications"
+           return 0 
+       fi
+    fi
+    
+}
+_mission_check
diff --git a/missions/contrib/git_advanced/03_edit_commit_push_Readme/clean.sh b/missions/contrib/git_advanced/03_edit_commit_push_Readme/clean.sh
new file mode 120000
index 000000000..614a72e95
--- /dev/null
+++ b/missions/contrib/git_advanced/03_edit_commit_push_Readme/clean.sh
@@ -0,0 +1 @@
+../../git_basics/00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_advanced/03_edit_commit_push_Readme/goal.txt b/missions/contrib/git_advanced/03_edit_commit_push_Readme/goal.txt
new file mode 100644
index 000000000..5a3ee789a
--- /dev/null
+++ b/missions/contrib/git_advanced/03_edit_commit_push_Readme/goal.txt
@@ -0,0 +1,46 @@
+Mission goal
+============
+
+The front page of a SpellBook is important for magicians.
+
+It usually gives informations on the content of the SpellBook, and how to use it.
+
+Edit the front page (README.md), and add a brief description of the first spell.
+
+Then synchronise your spellbook with the library
+
+
+Useful commands
+===============
+
+You can use any text editor:
+gedit FILENAME
+vi FILENAME
+nano FILENAME
+
+
+when modifying a file you can commit the modification for this file in one go:
+git commit -m 'COMMIT_MESSAGE' FILENAME
+
+
+But staged modifications can work as well, and are usualy a better practice:
+
+git add FILENAME
+git commit -m 'COMMIT_MESSAGE'
+
+This allows you to modify multiple files while performing a single commit
+
+
+git push
+
+
+NB
+===============
+You can also use the following commands
+
+git log
+
+
+git status
+
+
diff --git a/missions/contrib/git_advanced/03_edit_commit_push_Readme/init.sh b/missions/contrib/git_advanced/03_edit_commit_push_Readme/init.sh
new file mode 100644
index 000000000..7f179b1b5
--- /dev/null
+++ b/missions/contrib/git_advanced/03_edit_commit_push_Readme/init.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git reset --hard origin/moving_spell_into_Chapter_1 &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_advanced/03_edit_commit_push_Readme/static.sh b/missions/contrib/git_advanced/03_edit_commit_push_Readme/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_advanced/03_edit_commit_push_Readme/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/04_git_rm/_clean.sh b/missions/contrib/git_advanced/04_git_rm/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_advanced/04_git_rm/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_advanced/04_git_rm/_test.sh b/missions/contrib/git_advanced/04_git_rm/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_advanced/04_git_rm/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/04_git_rm/_treasure-msg.txt b/missions/contrib/git_advanced/04_git_rm/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_advanced/04_git_rm/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_advanced/04_git_rm/_treasure.sh b/missions/contrib/git_advanced/04_git_rm/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_advanced/04_git_rm/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_advanced/04_git_rm/auto.sh b/missions/contrib/git_advanced/04_git_rm/auto.sh
new file mode 100644
index 000000000..2263fb58f
--- /dev/null
+++ b/missions/contrib/git_advanced/04_git_rm/auto.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+git rm Chapter_1/truth_spell 
+git commit -m  "truth spell removed" 
+git push
+gsh check
+
diff --git a/missions/contrib/git_advanced/04_git_rm/check.sh b/missions/contrib/git_advanced/04_git_rm/check.sh
new file mode 100644
index 000000000..1690eb8e5
--- /dev/null
+++ b/missions/contrib/git_advanced/04_git_rm/check.sh
@@ -0,0 +1,74 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+
+ if [ ! -e "$GSH_HOME/Castle/Portals/spellbook/Chapter_1/truth_spell" ]
+    then 
+     echo " The file truth_spell does not exist"
+    else
+    echo " The file  truth_spell  should not exist anymore"
+    return 1
+    fi
+
+ cd $GSH_HOME/Castle/Portals/spellbook/
+
+LANG=en_GB git status | grep -e "Untracked"
+ 
+  test=$(echo $?)
+          
+  if [ $test -eq 0 ]
+    then 
+      echo " you not have untracked file"
+      return 1
+  fi
+  
+  
+  
+LANG=en_GB git status | grep -e "deleted"
+ 
+  test=$(echo $?)
+          
+  if [ $test -eq 0 ]
+    then 
+      echo " you deleted a file: use 'git rm' instead of 'rm' and/or commit your modifications"
+      return 1
+  fi
+  
+  
+
+    LANG=en_GB git status | grep -e "up to date with"
+test=$(echo $?)
+          
+  if [ $test -eq 1 ]
+    then 
+      echo " You did not pushed all of your modifications"
+      return 1
+    else
+      cd $GSH_HOME/Castle/Portals/spellbook/
+
+       LANG=en_GB git status | grep -e "Changes to be committed:"
+       test=$(echo $?)
+      
+       if [ $test -eq 0 ]
+          then 
+            echo " You did not commited all of your modifications"
+            return 1
+         else 
+           echo " You did pushed all of your modifications"
+           return 0 
+       fi
+    fi
+     
+}
+_mission_check
diff --git a/missions/contrib/git_advanced/04_git_rm/clean.sh b/missions/contrib/git_advanced/04_git_rm/clean.sh
new file mode 120000
index 000000000..614a72e95
--- /dev/null
+++ b/missions/contrib/git_advanced/04_git_rm/clean.sh
@@ -0,0 +1 @@
+../../git_basics/00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_advanced/04_git_rm/goal.txt b/missions/contrib/git_advanced/04_git_rm/goal.txt
new file mode 100644
index 000000000..f925de06e
--- /dev/null
+++ b/missions/contrib/git_advanced/04_git_rm/goal.txt
@@ -0,0 +1,20 @@
+Mission goal
+============
+
+Althought the glowing finger spell is obviously usefull, the usefullness of the truth spell seems inexistant.
+
+Remove the truth spell from your spellbook.
+
+
+Useful commands
+===============
+
+git rm FILENAME : remove the file FILENAME
+
+git commit -m 'COMMIT_MESSAGE'
+
+git push
+
+
+
+
diff --git a/missions/contrib/git_advanced/04_git_rm/init.sh b/missions/contrib/git_advanced/04_git_rm/init.sh
new file mode 100644
index 000000000..347014900
--- /dev/null
+++ b/missions/contrib/git_advanced/04_git_rm/init.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git reset --hard origin/README_updated &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_advanced/04_git_rm/static.sh b/missions/contrib/git_advanced/04_git_rm/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_advanced/04_git_rm/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/05a_git_checkout/_clean.sh b/missions/contrib/git_advanced/05a_git_checkout/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_advanced/05a_git_checkout/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_advanced/05a_git_checkout/_test.sh b/missions/contrib/git_advanced/05a_git_checkout/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_advanced/05a_git_checkout/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/05a_git_checkout/_treasure-msg.txt b/missions/contrib/git_advanced/05a_git_checkout/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_advanced/05a_git_checkout/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_advanced/05a_git_checkout/_treasure.sh b/missions/contrib/git_advanced/05a_git_checkout/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_advanced/05a_git_checkout/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_advanced/05a_git_checkout/auto.sh b/missions/contrib/git_advanced/05a_git_checkout/auto.sh
new file mode 100644
index 000000000..b9d5a8d23
--- /dev/null
+++ b/missions/contrib/git_advanced/05a_git_checkout/auto.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+git checkout HEAD^
+gsh check
+
diff --git a/missions/contrib/git_advanced/05a_git_checkout/check.sh b/missions/contrib/git_advanced/05a_git_checkout/check.sh
new file mode 100644
index 000000000..377624771
--- /dev/null
+++ b/missions/contrib/git_advanced/05a_git_checkout/check.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+
+ if [ ! -e "$GSH_HOME/Castle/Portals/spellbook/Chapter_1/truth_spell" ]
+    then 
+      echo " The file  truth_spell is not in Chapter_1"
+      return 1
+    fi
+
+     LANG=en_GB git branch | grep -e "tach"
+
+    test=$(echo $?)
+
+ if [ $test -eq 1 ]
+    then 
+      echo " You did not checkout a previous commit"
+      return 1
+    else
+      return 0 
+      
+ fi
+  
+
+
+
+   
+}
+_mission_check
diff --git a/missions/contrib/git_advanced/05a_git_checkout/clean.sh b/missions/contrib/git_advanced/05a_git_checkout/clean.sh
new file mode 120000
index 000000000..614a72e95
--- /dev/null
+++ b/missions/contrib/git_advanced/05a_git_checkout/clean.sh
@@ -0,0 +1 @@
+../../git_basics/00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_advanced/05a_git_checkout/goal.txt b/missions/contrib/git_advanced/05a_git_checkout/goal.txt
new file mode 100644
index 000000000..3279ac32a
--- /dev/null
+++ b/missions/contrib/git_advanced/05a_git_checkout/goal.txt
@@ -0,0 +1,25 @@
+Mission goal
+============
+
+You just removed the spell of truth from your spellbook.
+
+As mentionned earlier, the point of the synchronised Library is not just to share your spells, but also to keep track of your modifications.
+
+Even a deleted spell can be read through the specific comand line.
+
+Ask git with a checkout to update your working directory with a previous version of your spellbook, a version that still contains the truth spell in Chapter_1.
+
+
+Useful commands
+===============
+
+git checkout COMMIT_ID
+COMMIT_ID can be the id given by `git log` or a branch name 
+
+Warning: specifying directly a commit id will bring you in "detached HEAD". It is ok to explore this version of the project, but if some development should be done from this version, a proper new branch will be necessary.
+
+git log --oneline: will display the list of previous commit in a nicer way
+
+
+
+
diff --git a/missions/contrib/git_advanced/05a_git_checkout/init.sh b/missions/contrib/git_advanced/05a_git_checkout/init.sh
new file mode 100644
index 000000000..e105df1ac
--- /dev/null
+++ b/missions/contrib/git_advanced/05a_git_checkout/init.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git reset --hard origin/truth_spell_removed &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_advanced/05a_git_checkout/static.sh b/missions/contrib/git_advanced/05a_git_checkout/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_advanced/05a_git_checkout/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/05b_git_checkout/_clean.sh b/missions/contrib/git_advanced/05b_git_checkout/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_advanced/05b_git_checkout/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_advanced/05b_git_checkout/_test.sh b/missions/contrib/git_advanced/05b_git_checkout/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_advanced/05b_git_checkout/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/05b_git_checkout/_treasure-msg.txt b/missions/contrib/git_advanced/05b_git_checkout/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_advanced/05b_git_checkout/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_advanced/05b_git_checkout/_treasure.sh b/missions/contrib/git_advanced/05b_git_checkout/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_advanced/05b_git_checkout/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_advanced/05b_git_checkout/auto.sh b/missions/contrib/git_advanced/05b_git_checkout/auto.sh
new file mode 100644
index 000000000..178ccf635
--- /dev/null
+++ b/missions/contrib/git_advanced/05b_git_checkout/auto.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+git checkout main
+gsh check
+
diff --git a/missions/contrib/git_advanced/05b_git_checkout/check.sh b/missions/contrib/git_advanced/05b_git_checkout/check.sh
new file mode 100644
index 000000000..0ccb89552
--- /dev/null
+++ b/missions/contrib/git_advanced/05b_git_checkout/check.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+ LANG=en_GB git branch | grep -e "tach"
+test=$(echo $?)
+
+ if [ $test -eq 1 ]
+    then 
+      return 0
+    else
+              echo " You did not checkout the most recent commit"
+
+         return 1
+      
+    fi
+   
+}
+_mission_check
diff --git a/missions/contrib/git_advanced/05b_git_checkout/clean.sh b/missions/contrib/git_advanced/05b_git_checkout/clean.sh
new file mode 120000
index 000000000..614a72e95
--- /dev/null
+++ b/missions/contrib/git_advanced/05b_git_checkout/clean.sh
@@ -0,0 +1 @@
+../../git_basics/00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_advanced/05b_git_checkout/goal.txt b/missions/contrib/git_advanced/05b_git_checkout/goal.txt
new file mode 100644
index 000000000..de50debeb
--- /dev/null
+++ b/missions/contrib/git_advanced/05b_git_checkout/goal.txt
@@ -0,0 +1,27 @@
+Mission goal
+============
+
+
+You are familiar with the history of modifications.
+
+Now, you need to go back to the most recent version of your spellbook.
+
+Ask git to update your working directory with this version by specifying the main branch of your spellbook.
+
+
+
+Useful commands
+===============
+
+git log oneline : will display the list of previous commit
+
+
+git checkout BRANCH_NAME: will checkout the most recent commit of the branch "BRANCH_NAME"
+
+git branch: display your current branch and the list of available branches.
+
+
+NB
+============
+
+branches will be introduced more properly in the next missions.
diff --git a/missions/contrib/git_advanced/05b_git_checkout/init.sh b/missions/contrib/git_advanced/05b_git_checkout/init.sh
new file mode 100644
index 000000000..68ebbd5b9
--- /dev/null
+++ b/missions/contrib/git_advanced/05b_git_checkout/init.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git reset --hard origin/truth_spell_removed &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+    git checkout HEAD^ &> /dev/null
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_advanced/05b_git_checkout/static.sh b/missions/contrib/git_advanced/05b_git_checkout/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_advanced/05b_git_checkout/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/06_git_revert/_clean.sh b/missions/contrib/git_advanced/06_git_revert/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_advanced/06_git_revert/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_advanced/06_git_revert/_test.sh b/missions/contrib/git_advanced/06_git_revert/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_advanced/06_git_revert/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/06_git_revert/_treasure-msg.txt b/missions/contrib/git_advanced/06_git_revert/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_advanced/06_git_revert/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_advanced/06_git_revert/_treasure.sh b/missions/contrib/git_advanced/06_git_revert/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_advanced/06_git_revert/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_advanced/06_git_revert/auto.sh b/missions/contrib/git_advanced/06_git_revert/auto.sh
new file mode 100644
index 000000000..16f0f0e2b
--- /dev/null
+++ b/missions/contrib/git_advanced/06_git_revert/auto.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+git revert HEAD --no-edit
+git push
+gsh check
+
diff --git a/missions/contrib/git_advanced/06_git_revert/check.sh b/missions/contrib/git_advanced/06_git_revert/check.sh
new file mode 100644
index 000000000..4185b54c7
--- /dev/null
+++ b/missions/contrib/git_advanced/06_git_revert/check.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+ if [ ! -e "$GSH_HOME/Castle/Portals/spellbook/Chapter_1/truth_spell" ]
+    then 
+      echo " The file  truth_spell is not in Chapter_1"
+      return 1
+    fi
+
+  LANG=en_GB git status | grep -e "up to date with"
+test=$(echo $?)
+
+ if [ $test -eq 1 ]
+      then 
+      echo " You did not pushed all of your modifications"
+      return 1
+    else
+        LANG=en_GB git status | grep -e "nothing to commit"
+        test=$(echo $?)
+         if [ $test -eq 1 ]
+            then 
+               echo " You did not commited all of your modifications"
+           return 1
+          else 
+          
+             LANG=en_GB git branch | grep -e "tach"
+
+             if [ $test -eq 0 ]
+                then 
+                  return 0
+                else
+                  echo " You did not checkout the most recent commit"
+                  return 1
+      
+            fi
+         fi
+  fi
+   
+}
+_mission_check
diff --git a/missions/contrib/git_advanced/06_git_revert/clean.sh b/missions/contrib/git_advanced/06_git_revert/clean.sh
new file mode 120000
index 000000000..614a72e95
--- /dev/null
+++ b/missions/contrib/git_advanced/06_git_revert/clean.sh
@@ -0,0 +1 @@
+../../git_basics/00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_advanced/06_git_revert/goal.txt b/missions/contrib/git_advanced/06_git_revert/goal.txt
new file mode 100644
index 000000000..361c7a8d0
--- /dev/null
+++ b/missions/contrib/git_advanced/06_git_revert/goal.txt
@@ -0,0 +1,18 @@
+Mission goal
+============
+
+You just removed the file spell of truth.
+
+When they saw your lastest commit, the previous wizzard of your castle was greatly confused.
+
+They just send you a message with a instant magic pigeon:
+
+"It took a lot of work to get this spell working properly. Please revert what you just did."
+
+
+Useful commands
+===============
+
+git revert HEAD : revert the modifications of the commit pointed by HEAD. One could have put a branch name here also. This commands creates a new commit which will cancel the modifications.
+
+git push
diff --git a/missions/contrib/git_advanced/06_git_revert/init.sh b/missions/contrib/git_advanced/06_git_revert/init.sh
new file mode 100644
index 000000000..e105df1ac
--- /dev/null
+++ b/missions/contrib/git_advanced/06_git_revert/init.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git reset --hard origin/truth_spell_removed &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_advanced/06_git_revert/static.sh b/missions/contrib/git_advanced/06_git_revert/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_advanced/06_git_revert/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_advanced/git_advanced.idx b/missions/contrib/git_advanced/git_advanced.idx
new file mode 100644
index 000000000..94bd2c479
--- /dev/null
+++ b/missions/contrib/git_advanced/git_advanced.idx
@@ -0,0 +1,8 @@
+01_sshkey
+02_git_mv
+03_edit_commit_push_Readme
+04_git_rm
+05a_git_checkout
+05b_git_checkout
+06_git_revert
+
diff --git a/missions/contrib/git_basics.idx b/missions/contrib/git_basics.idx
new file mode 100644
index 000000000..91c0a2156
--- /dev/null
+++ b/missions/contrib/git_basics.idx
@@ -0,0 +1,23 @@
+git_basics/00_needed_files
+git_basics/01_create_newrepo
+git_config/02_configGitID
+git_basics/02a_create_newSpell
+git_basics/02b_add_newSpell
+git_basics/02c_commit_newSpell
+git_basics/02d_push_newSpell
+git_basics/03_second_spell_add_commit_push
+git_advanced/02_git_mv
+git_advanced/04_git_rm
+git_advanced/05a_git_checkout
+git_advanced/05b_git_checkout
+git_advanced/06_git_revert
+git_basics/04_third_spell_branch
+git_basics/05_fifth_spell
+git_basics/06_sixth_spell
+git_basics/07a_mergeFF_question
+git_basics/07b_mergeFF
+git_basics/08a_merge_question
+git_basics/08b_merge
+git_basics/09_merge_conflict
+git_basics/10_merge_request
+
diff --git a/missions/contrib/git_basics/00_needed_files/add_remote_origin.sh b/missions/contrib/git_basics/00_needed_files/add_remote_origin.sh
new file mode 100644
index 000000000..3705a09b2
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/add_remote_origin.sh
@@ -0,0 +1,22 @@
+
+# if a proper remote has been set in mission 1, origin_url exists and file contains its address. 
+if [ -f $GSH_TMP/origin_url ]
+then
+  origin_url=$(cat $GSH_TMP/origin_url)
+  git remote rm origin &> /dev/null
+  git remote add origin $origin_url &> /dev/null
+  git push -u origin main --force &> /dev/null
+  if [ $? -eq 1 ]
+  then
+    echo "Error: Could not reset remote repository. Are you sure you have unprotected the main branch ?"
+  else
+    echo "Info: environment reset, your remote repository has been updated with the predefined environment for this mission"
+  fi
+else
+  echo "Warning: could not retrieve the url of your repository, please add it again"
+  echo "git remote rm origin"
+  echo "git remote add origin ORIGIN_URL"
+  echo "Or do nothing, push will work but you will not see anything evolving on the web interface"
+  # Set upstream branch to get the correct message when asking for status => necessary for checks
+  git push -u origin main &> /dev/null 
+fi
diff --git a/missions/contrib/git_basics/00_needed_files/amplifier_conflict_fixed b/missions/contrib/git_basics/00_needed_files/amplifier_conflict_fixed
new file mode 100644
index 000000000..817fa80eb
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/amplifier_conflict_fixed
@@ -0,0 +1,4 @@
+50 66
+50 77
+cheater_spell
+beer_spell
diff --git a/missions/contrib/git_basics/00_needed_files/beer/amplifier b/missions/contrib/git_basics/00_needed_files/beer/amplifier
new file mode 100644
index 000000000..41112c89b
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/beer/amplifier
@@ -0,0 +1,3 @@
+50 66
+50 77
+beer_spell
diff --git a/missions/contrib/git_basics/00_needed_files/beer/beer_spell b/missions/contrib/git_basics/00_needed_files/beer/beer_spell
new file mode 100644
index 000000000..5a98747c8
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/beer/beer_spell
@@ -0,0 +1,4 @@
+20 88
+60 33
+15 44
+5  99
diff --git a/missions/contrib/git_basics/00_needed_files/cheater/amplifier b/missions/contrib/git_basics/00_needed_files/cheater/amplifier
new file mode 100644
index 000000000..3d5346c1d
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/cheater/amplifier
@@ -0,0 +1,3 @@
+50 66
+50 77
+cheater_spell
diff --git a/missions/contrib/git_basics/00_needed_files/cheater/cheater_spell b/missions/contrib/git_basics/00_needed_files/cheater/cheater_spell
new file mode 100644
index 000000000..ed6334083
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/cheater/cheater_spell
@@ -0,0 +1,2 @@
+80 222
+20 55
diff --git a/missions/contrib/git_basics/00_needed_files/clean.sh b/missions/contrib/git_basics/00_needed_files/clean.sh
new file mode 100644
index 000000000..a812b337c
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/clean.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
+
+# back to HOM in order to avoid getcwd error
+
+if [ $GSH_LAST_ACTION = check_false ] || [ $GSH_LAST_ACTION = check_true ]  || [ $GSH_LAST_ACTION = exit ] 
+then
+  touch $GSH_TMP/skip_init
+else
+  cd $GSH_HOME
+  rm -rf $GSH_HOME/Castle/Portals/spellbook
+  rm -rf $GSH_TMP/spellbook
+  echo "Warning: repository reset, you might have issue when pushing. If yes add --force option when pushing. Jafar will be author of some commits, but it is ok, he knows what he is doing !"
+fi
diff --git a/missions/contrib/git_basics/00_needed_files/clone.sh b/missions/contrib/git_basics/00_needed_files/clone.sh
new file mode 100644
index 000000000..8f21605b7
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/clone.sh
@@ -0,0 +1,25 @@
+echo "clone.sh"
+cd $GSH_HOME/Castle/Portals
+cp -r $GSH_TMP/solution_repo $GSH_TMP/spellbook
+git clone $GSH_TMP/spellbook
+cd spellbook
+if [ -f $GSH_TMP/gitconfig ]
+then
+  git config --local user.name $(cat $GSH_TMP/gitconfig | grep name | cut -d '=' -f2)
+  git config --local user.email $(cat $GSH_TMP/gitconfig | grep email | cut -d '=' -f2)
+else
+  git config --local user.name Jaffar
+  git config --local user.email jaffar@aladin.cool
+fi
+git config --local core.editor nano
+git config --local alias.co checkout
+git config --local alias.br branch
+git config --local alias.ci commit
+git config --local alias.st status
+git config --local alias.last "log -1 HEAD"
+git config --local alias.lo "log --oneline --graph --branches"
+#git config --local alias.push "push --force"
+
+
+git reset --hard origin/init
+git push origin main --force
diff --git a/missions/contrib/git_basics/00_needed_files/flame_spell b/missions/contrib/git_basics/00_needed_files/flame_spell
new file mode 100644
index 000000000..7e0974deb
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/flame_spell
@@ -0,0 +1,2 @@
+90 22
+10 11
diff --git a/missions/contrib/git_basics/00_needed_files/gen_solution.sh b/missions/contrib/git_basics/00_needed_files/gen_solution.sh
new file mode 100644
index 000000000..a0ff94844
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/gen_solution.sh
@@ -0,0 +1,76 @@
+cd Castle/Portals/
+rm -rf spellbook solution_repo
+mkdir spellbook solution_repo
+cd solution_repo
+git init --bare 
+
+cd ../spellbook
+git init --initial-branch=main
+git config --local user.name "Jafar"
+git config --local user.email "<jafar@aladin.cool>"
+
+
+echo "Toy repository to learn git with [GameShell_git](https://github.com/MKessar/GameShell_git)" > README.md
+git add README.md
+git commit -m "initial repo with README" 
+git branch init
+
+cp ../glowing_finger_spell .
+git add glowing_finger_spell 
+git commit -m 'glowing finger spell added' 
+git branch glowing_finger_spell_added
+
+cp ../truth_spell .
+git add truth_spell
+git commit -m "truth spell added" 
+git branch truth_spell_added
+
+mkdir Chapter_1
+git mv truth_spell glowing_finger_spell Chapter_1/
+git commit -m "moving spell into Chapter_1" 
+git branch moving_spell_into_Chapter_1
+
+git rm Chapter_1/truth_spell 
+git commit -m  "truth spell removed"  
+git branch  truth_spell_removed 
+
+git revert HEAD --no-edit
+git commit --amend  --no-edit
+git branch revert 
+
+cp ../flame_spell .
+git checkout -b flame main
+git add flame_spell
+git commit -m "flame spell added" 
+git branch flame_added
+
+cp ../cheater/* .
+git co -b cheater main
+git add cheater_spell amplifier
+git ci -m "cheater spell added" 
+git branch cheater_added
+
+git co -b beer main
+cp ../beer/* .
+git add beer_spell amplifier
+git ci -m "beer spell added" 
+git branch beer_added
+
+git co main
+git merge flame --no-edit
+git branch flame_merged
+
+git merge cheater --no-edit 
+git branch cheater_merged
+
+git merge beer --no-edit
+cp ../amplifier_conflict_fixed ./amplifier
+git add amplifier
+git ci --no-edit 
+git branch beer_merged
+
+git remote add origin ../solution_repo
+git push origin main init glowing_finger_spell_added truth_spell_added moving_spell_into_Chapter_1 flame_added cheater_added beer_added flame_merged cheater_merged beer_merged truth_spell_removed revert
+
+cd ..
+echo "ref: refs/heads/main" > solution_repo/HEAD
diff --git a/missions/contrib/git_basics/00_needed_files/glowing_finger_spell b/missions/contrib/git_basics/00_needed_files/glowing_finger_spell
new file mode 100644
index 000000000..a957b56d2
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/glowing_finger_spell
@@ -0,0 +1,6 @@
+95 66
+5 22
+
+
+NB:
+This Spell cannot be used to Phone Home.
diff --git a/missions/contrib/git_basics/00_needed_files/remove_init_branches.sh b/missions/contrib/git_basics/00_needed_files/remove_init_branches.sh
new file mode 100644
index 000000000..dcda19c2f
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/remove_init_branches.sh
@@ -0,0 +1,12 @@
+git push origin -d init\
+  glowing_finger_spell_added\
+  truth_spell_added\
+  moving_spell_into_Chapter_1\
+  flame_added\
+  cheater_added\
+  beer_added\
+  flame_merged\
+  cheater_merged\
+  beer_merged\
+  truth_spell_removed\
+  revert 
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/HEAD b/missions/contrib/git_basics/00_needed_files/solution_repo/HEAD
new file mode 100644
index 000000000..b870d8262
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/main
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/config b/missions/contrib/git_basics/00_needed_files/solution_repo/config
new file mode 100644
index 000000000..07d359d07
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/config
@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/description b/missions/contrib/git_basics/00_needed_files/solution_repo/description
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/applypatch-msg.sample b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/applypatch-msg.sample
new file mode 100755
index 000000000..a5d7b84a6
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/applypatch-msg.sample
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
+:
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/commit-msg.sample b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/commit-msg.sample
new file mode 100755
index 000000000..b58d1184a
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/commit-msg.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/fsmonitor-watchman.sample b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/fsmonitor-watchman.sample
new file mode 100755
index 000000000..14ed0aa42
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/fsmonitor-watchman.sample
@@ -0,0 +1,173 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+	die "Unsupported query-fsmonitor hook version '$version'.\n" .
+	    "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
+
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
+
+	# In the query expression below we're asking for names of files that
+	# changed since $last_update_token but not from the .git folder.
+	#
+	# To accomplish this, we're using the "since" generator to use the
+	# recency index to select candidate nodes and "fields" to limit the
+	# output to file names only. Then we're using the "expression" term to
+	# further constrain the results.
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+	}
+	my $query = <<"	END";
+		["query", "$git_work_tree", {
+			"since": $last_update_token,
+			"fields": ["name"],
+			"expression": ["not", ["dirname", ".git"]]
+		}]
+	END
+
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
+	print CHLD_IN $query;
+	close CHLD_IN;
+	my $response = do {local $/; <CHLD_OUT>};
+
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
+	die "Watchman: command returned no output.\n" .
+	"Falling back to scanning...\n" if $response eq "";
+	die "Watchman: command returned invalid output: $response\n" .
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
+		$retry--;
+		my $response = qx/watchman watch "$git_work_tree"/;
+		die "Failed to make watchman watch '$git_work_tree'.\n" .
+		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
+
+		# Watchman will always return all files on the first query so
+		# return the fast "everything is dirty" flag to git and do the
+		# Watchman query just to get it over with now so we won't pay
+		# the cost in git to look up each individual file.
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
+		eval { launch_watchman() };
+		return 0;
+	}
+
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;
+
+	return 1;
+}
+
+sub get_working_dir {
+	my $working_dir;
+	if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+		$working_dir = Win32::GetCwd();
+		$working_dir =~ tr/\\/\//;
+	} else {
+		require Cwd;
+		$working_dir = Cwd::cwd();
+	}
+
+	return $working_dir;
+}
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/post-update.sample b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/post-update.sample
new file mode 100755
index 000000000..ec17ec193
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/post-update.sample
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-applypatch.sample b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-applypatch.sample
new file mode 100755
index 000000000..4142082bc
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-applypatch.sample
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
+:
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-commit.sample b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-commit.sample
new file mode 100755
index 000000000..e144712c8
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-commit.sample
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=$(git hash-object -t tree /dev/null)
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --type=bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-merge-commit.sample b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-merge-commit.sample
new file mode 100755
index 000000000..399eab192
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-merge-commit.sample
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+        exec "$GIT_DIR/hooks/pre-commit"
+:
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-push.sample b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-push.sample
new file mode 100755
index 000000000..4ce688d32
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-push.sample
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+	if test "$local_oid" = "$zero"
+	then
+		# Handle delete
+		:
+	else
+		if test "$remote_oid" = "$zero"
+		then
+			# New branch, examine all commits
+			range="$local_oid"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_oid..$local_oid"
+		fi
+
+		# Check for WIP commit
+		commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+		if test -n "$commit"
+		then
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-rebase.sample b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-rebase.sample
new file mode 100755
index 000000000..6cbef5c37
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-rebase.sample
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up to date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".
+
+DOC_END
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-receive.sample b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-receive.sample
new file mode 100755
index 000000000..a1fd29ec1
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/pre-receive.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to make use of push options.
+# The example simply echoes all push options that start with 'echoback='
+# and rejects all pushes when the "reject" push option is used.
+#
+# To enable this hook, rename this file to "pre-receive".
+
+if test -n "$GIT_PUSH_OPTION_COUNT"
+then
+	i=0
+	while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
+	do
+		eval "value=\$GIT_PUSH_OPTION_$i"
+		case "$value" in
+		echoback=*)
+			echo "echo from the pre-receive-hook: ${value#*=}" >&2
+			;;
+		reject)
+			exit 1
+		esac
+		i=$((i + 1))
+	done
+fi
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/prepare-commit-msg.sample b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/prepare-commit-msg.sample
new file mode 100755
index 000000000..10fa14c5a
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/prepare-commit-msg.sample
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
+
+# case "$COMMIT_SOURCE,$SHA1" in
+#  ,|template,)
+#    /usr/bin/perl -i.bak -pe '
+#       print "\n" . `git diff --cached --name-status -r`
+# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+#  *) ;;
+# esac
+
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/push-to-checkout.sample b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/push-to-checkout.sample
new file mode 100755
index 000000000..af5a0c001
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/push-to-checkout.sample
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+	echo >&2 "$*"
+	exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+	die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+	die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+#   head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+	head=HEAD
+else
+	head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+	die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+	die "Could not update working tree to new HEAD"
+fi
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/update.sample b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/update.sample
new file mode 100755
index 000000000..c4d426bc6
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/hooks/update.sample
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to block unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/info/exclude b/missions/contrib/git_basics/00_needed_files/solution_repo/info/exclude
new file mode 100644
index 000000000..a5196d1be
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/01/1fd9d4117cd7f519f9112ce518230e35828dd6 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/01/1fd9d4117cd7f519f9112ce518230e35828dd6
new file mode 100644
index 000000000..e1d3c813a
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/01/1fd9d4117cd7f519f9112ce518230e35828dd6
@@ -0,0 +1 @@
+x
+)JMU�0e040031Qrut�u��MaP���s��@	�)F7%��Մw@���g�ǧ
�Ԣ��Ԝ���[su����y������_�",
�T#�
\ No newline at end of file
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/0a/0294c542b858ffee1a119a8ffaccf141f82134 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/0a/0294c542b858ffee1a119a8ffaccf141f82134
new file mode 100644
index 000000000..fced2841e
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/0a/0294c542b858ffee1a119a8ffaccf141f82134
@@ -0,0 +1,2 @@
+x
��A
+�0E]��2�I�D\{��dJ+�)5�����<�R�en�a<�M�:��dI�"t,t�L�'쀔`��fAz
֌�!b��专A�%!ϻ���Mu�y���;���"���žK���g����Zӿ"#��ѼW-�rΚ���Cx
\ No newline at end of file
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/0c/7c0aed1116816485432a5cbec29c34a6818363 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/0c/7c0aed1116816485432a5cbec29c34a6818363
new file mode 100644
index 000000000..4c1de8b34
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/0c/7c0aed1116816485432a5cbec29c34a6818363
@@ -0,0 +1 @@
+x
�OAj1�ٯ��ײeB�9ǒxm-ٲ����I>��Ќ`����s���U��٢˞9�%M�;#2��q��5�%u�U.
�"%�S��#�g����YK0!�U��s�p�S�p�}�w\b�/�T���w�HFk��}�����_&�#w�
v��@خ�,Pe-w�;�N�y��C��+����%�W�
\ No newline at end of file
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/17/987cee1441c667c2583e1561fb2254d79b6c40 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/17/987cee1441c667c2583e1561fb2254d79b6c40
new file mode 100644
index 000000000..c05bfe02e
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/17/987cee1441c667c2583e1561fb2254d79b6c40
@@ -0,0 +1 @@
+x
+)JMU042a040031Qrut�u��MaP���s��@	�)F7%��Մw@���g�ǧ
�Ԣ��Ԝ���[su����y������_�",��K�JK2����N����k��Y��[�8��k
<2�
\ No newline at end of file
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/20/8bcdc9149a6331c12aca6ef4a3c791503e30f0 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/20/8bcdc9149a6331c12aca6ef4a3c791503e30f0
new file mode 100644
index 000000000..6c3a3a0b6
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/20/8bcdc9149a6331c12aca6ef4a3c791503e30f0 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/21/f32eb9bb9a51180ba8643258d91812b67c5788 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/21/f32eb9bb9a51180ba8643258d91812b67c5788
new file mode 100644
index 000000000..79d27d9f6
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/21/f32eb9bb9a51180ba8643258d91812b67c5788 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/22/751b444b755a1e9e992bde47003d479fc93d98 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/22/751b444b755a1e9e992bde47003d479fc93d98
new file mode 100644
index 000000000..33c8e8aea
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/22/751b444b755a1e9e992bde47003d479fc93d98 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/33/46e2fc9bc645c45ee56becf0749669273b667f b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/33/46e2fc9bc645c45ee56becf0749669273b667f
new file mode 100644
index 000000000..c92d51c9a
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/33/46e2fc9bc645c45ee56becf0749669273b667f
@@ -0,0 +1 @@
+x
���j�0D{�W�=$��dA���a-�c�2����?�e�1��,S��G�UAlJ�\b���)��E���.�b1Q0��6P�hDa�Y(S�K#����ȳ�u�/d����>e�2��\�|9%�Z8�CM����_%��״>�g�y�imn�l��ݙ_f�E�
\ No newline at end of file
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/34/523755ac89a74c8f89edc2a6a5590a7edd6634 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/34/523755ac89a74c8f89edc2a6a5590a7edd6634
new file mode 100644
index 000000000..faa3bfb2a
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/34/523755ac89a74c8f89edc2a6a5590a7edd6634 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/37/dd961f914dfabb29b01d16f0ef850e084b1b7d b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/37/dd961f914dfabb29b01d16f0ef850e084b1b7d
new file mode 100644
index 000000000..c7a2ca43b
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/37/dd961f914dfabb29b01d16f0ef850e084b1b7d differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/3d/5346c1d491997e506a491d48745de035e4acdf b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/3d/5346c1d491997e506a491d48745de035e4acdf
new file mode 100644
index 000000000..7f114b965
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/3d/5346c1d491997e506a491d48745de035e4acdf differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/41/112c89bba450bee595b159858180fb2ca4beb6 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/41/112c89bba450bee595b159858180fb2ca4beb6
new file mode 100644
index 000000000..36d9cc120
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/41/112c89bba450bee595b159858180fb2ca4beb6 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/42/1a6c94f94f0c85631579730c8354d0e828cba3 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/42/1a6c94f94f0c85631579730c8354d0e828cba3
new file mode 100644
index 000000000..4e61ea0b4
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/42/1a6c94f94f0c85631579730c8354d0e828cba3 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/43/a0bf792768823636d12afe10cad37c0df1b1eb b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/43/a0bf792768823636d12afe10cad37c0df1b1eb
new file mode 100644
index 000000000..78e8d6afb
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/43/a0bf792768823636d12afe10cad37c0df1b1eb
@@ -0,0 +1,2 @@
+x
��K
+1]��$��D\{��N�d������WPP��2�<�.Σu�8e��Ӝ��1k�RJΫ��<h��I�1&$|B�,!O�6����S����F3u8?��R��<O�Z�����Vk8�}��
�+R���k�Z�J��> �B4
\ No newline at end of file
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/49/c33fcb2c166e2a884cefeca2ec9d47dbee9c3a b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/49/c33fcb2c166e2a884cefeca2ec9d47dbee9c3a
new file mode 100644
index 000000000..5e4f69068
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/49/c33fcb2c166e2a884cefeca2ec9d47dbee9c3a differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/4e/121100c02b6e4e720f6821feaec4dd04d74fb0 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/4e/121100c02b6e4e720f6821feaec4dd04d74fb0
new file mode 100644
index 000000000..cbcd12863
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/4e/121100c02b6e4e720f6821feaec4dd04d74fb0
@@ -0,0 +1,2 @@
+x
��M
+�0F]��$͏q@D�n7�`�LiJ�H�x}�7p��{_(�t�nZe����1�;k�cdD�#'����PG<z��T��@�ӊ3e�iمR�iM"꽒��"���%����(C�g�wj#<���ދ#s7J
\ No newline at end of file
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/5a/98747c811bc0f0696e73243781de649e9b501d b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/5a/98747c811bc0f0696e73243781de649e9b501d
new file mode 100644
index 000000000..18304f818
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/5a/98747c811bc0f0696e73243781de649e9b501d differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/6e/94fc5457fbf41dd0db8ef82e8b8ff31ae5dff8 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/6e/94fc5457fbf41dd0db8ef82e8b8ff31ae5dff8
new file mode 100644
index 000000000..da090e902
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/6e/94fc5457fbf41dd0db8ef82e8b8ff31ae5dff8 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/74/1834bf3f822c855abed838a16c72b392974bfb b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/74/1834bf3f822c855abed838a16c72b392974bfb
new file mode 100644
index 000000000..a491c5641
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/74/1834bf3f822c855abed838a16c72b392974bfb differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/77/435ccebc7343fde2d66b85aef2a61385a68325 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/77/435ccebc7343fde2d66b85aef2a61385a68325
new file mode 100644
index 000000000..599477e1b
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/77/435ccebc7343fde2d66b85aef2a61385a68325
@@ -0,0 +1 @@
+x
���JD1Dݚ��b�$��<DDp'�����!��7�p�jS�бmmh�p3��.&���.`�������Jx��Y/ũ+vه����T�l��'�BB�}�"2'��whJ�bH	\p�-`k�E2\m�R~����+V���㧞qEn�=���m�\.�1���T��2�_'�&�}jw��ϓ���:�c�k����N��]�V�t�
��Z�
\ No newline at end of file
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/7e/0974deb591b87db2038b9b47ac1e803f58f0ca b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/7e/0974deb591b87db2038b9b47ac1e803f58f0ca
new file mode 100644
index 000000000..4a4afd754
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/7e/0974deb591b87db2038b9b47ac1e803f58f0ca differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/81/7fa80eb21796847f43e8d79847b4daa684f1e0 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/81/7fa80eb21796847f43e8d79847b4daa684f1e0
new file mode 100644
index 000000000..b623b4fc4
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/81/7fa80eb21796847f43e8d79847b4daa684f1e0 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/92/6d94bb385865fb8582b7e3da61b3390ea8f7a3 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/92/6d94bb385865fb8582b7e3da61b3390ea8f7a3
new file mode 100644
index 000000000..49f7a8d4a
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/92/6d94bb385865fb8582b7e3da61b3390ea8f7a3 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/a0/99435d798656b546068752eef343b16cd03946 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/a0/99435d798656b546068752eef343b16cd03946
new file mode 100644
index 000000000..7c4555c08
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/a0/99435d798656b546068752eef343b16cd03946 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/a9/57b56d2c33e79cf9c53e36edf282fa48fa5839 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/a9/57b56d2c33e79cf9c53e36edf282fa48fa5839
new file mode 100644
index 000000000..69257b260
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/a9/57b56d2c33e79cf9c53e36edf282fa48fa5839 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/b0/9e178f521dd85dc7d259914cfc524e7b314eb3 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/b0/9e178f521dd85dc7d259914cfc524e7b314eb3
new file mode 100644
index 000000000..740a966d7
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/b0/9e178f521dd85dc7d259914cfc524e7b314eb3 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/b0/a96cc493f3259ad189534a6cf99d88d1f7c447 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/b0/a96cc493f3259ad189534a6cf99d88d1f7c447
new file mode 100644
index 000000000..d662a2c0c
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/b0/a96cc493f3259ad189534a6cf99d88d1f7c447
@@ -0,0 +1,2 @@
+x
��K
+1]��$I�"��E'��H�1�������/�u]&h�s0CԮD���i�N���S	1J�P=��h�s��>K⢔rA9�AM6'�:f4�׀���Q�
��WWjT��)��.������r�ȿk����hexm�P)\�e�B�
\ No newline at end of file
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/d5/87e363c2fbccc132bb95a39e3426f63dbe58b1 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/d5/87e363c2fbccc132bb95a39e3426f63dbe58b1
new file mode 100644
index 000000000..16346ccd8
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/d5/87e363c2fbccc132bb95a39e3426f63dbe58b1 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/da/89b55a380fbe3ce15ed172c83a56434c661b0b b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/da/89b55a380fbe3ce15ed172c83a56434c661b0b
new file mode 100644
index 000000000..e14a3f618
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/da/89b55a380fbe3ce15ed172c83a56434c661b0b differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/e4/e7014d33a5125a4c4b734e7d93f5740144e58b b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/e4/e7014d33a5125a4c4b734e7d93f5740144e58b
new file mode 100644
index 000000000..8fc6e9e30
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/e4/e7014d33a5125a4c4b734e7d93f5740144e58b differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/ed/6334083de2bab04e16ee15605f25ec75d61175 b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/ed/6334083de2bab04e16ee15605f25ec75d61175
new file mode 100644
index 000000000..0cb72e8a6
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/ed/6334083de2bab04e16ee15605f25ec75d61175 differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/objects/fc/e7d291dbf8869c03d6a78da00b4fc0d1ef68ba b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/fc/e7d291dbf8869c03d6a78da00b4fc0d1ef68ba
new file mode 100644
index 000000000..c40498350
Binary files /dev/null and b/missions/contrib/git_basics/00_needed_files/solution_repo/objects/fc/e7d291dbf8869c03d6a78da00b4fc0d1ef68ba differ
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/beer_added b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/beer_added
new file mode 100644
index 000000000..125fb61f9
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/beer_added
@@ -0,0 +1 @@
+43a0bf792768823636d12afe10cad37c0df1b1eb
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/beer_merged b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/beer_merged
new file mode 100644
index 000000000..7a1e0fda9
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/beer_merged
@@ -0,0 +1 @@
+77435ccebc7343fde2d66b85aef2a61385a68325
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/cheater_added b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/cheater_added
new file mode 100644
index 000000000..625812d6d
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/cheater_added
@@ -0,0 +1 @@
+0a0294c542b858ffee1a119a8ffaccf141f82134
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/cheater_merged b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/cheater_merged
new file mode 100644
index 000000000..4108a9a7a
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/cheater_merged
@@ -0,0 +1 @@
+49c33fcb2c166e2a884cefeca2ec9d47dbee9c3a
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/flame_added b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/flame_added
new file mode 100644
index 000000000..e1e753c19
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/flame_added
@@ -0,0 +1 @@
+b0a96cc493f3259ad189534a6cf99d88d1f7c447
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/flame_merged b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/flame_merged
new file mode 100644
index 000000000..e1e753c19
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/flame_merged
@@ -0,0 +1 @@
+b0a96cc493f3259ad189534a6cf99d88d1f7c447
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/glowing_finger_spell_added b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/glowing_finger_spell_added
new file mode 100644
index 000000000..3da7af048
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/glowing_finger_spell_added
@@ -0,0 +1 @@
+fce7d291dbf8869c03d6a78da00b4fc0d1ef68ba
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/init b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/init
new file mode 100644
index 000000000..26eac96c5
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/init
@@ -0,0 +1 @@
+4e121100c02b6e4e720f6821feaec4dd04d74fb0
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/main b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/main
new file mode 100644
index 000000000..7a1e0fda9
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/main
@@ -0,0 +1 @@
+77435ccebc7343fde2d66b85aef2a61385a68325
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/moving_spell_into_Chapter_1 b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/moving_spell_into_Chapter_1
new file mode 100644
index 000000000..7622dfd7b
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/moving_spell_into_Chapter_1
@@ -0,0 +1 @@
+3346e2fc9bc645c45ee56becf0749669273b667f
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/revert b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/revert
new file mode 100644
index 000000000..18b5f7cd3
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/revert
@@ -0,0 +1 @@
+0c7c0aed1116816485432a5cbec29c34a6818363
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/truth_spell_added b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/truth_spell_added
new file mode 100644
index 000000000..d54163773
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/truth_spell_added
@@ -0,0 +1 @@
+e4e7014d33a5125a4c4b734e7d93f5740144e58b
diff --git a/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/truth_spell_removed b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/truth_spell_removed
new file mode 100644
index 000000000..7a16d4a51
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/solution_repo/refs/heads/truth_spell_removed
@@ -0,0 +1 @@
+421a6c94f94f0c85631579730c8354d0e828cba3
diff --git a/missions/contrib/git_basics/00_needed_files/static.sh b/missions/contrib/git_basics/00_needed_files/static.sh
new file mode 100644
index 000000000..780762b21
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/static.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+if ! git --version > /dev/null 2 > /dev/null
+then  echo "git not found"
+  return 1
+fi
+
+mkdir -p $GSH_HOME/Castle/Portals/
+mkdir -p $GSH_HOME/Castle/Main_building/Library
+
+cp $MISSION_DIR/truth_spell $GSH_HOME/Castle/Main_building/Library/
+cp $MISSION_DIR/glowing_finger_spell $GSH_HOME/Castle/Main_building/Library/
+cp $MISSION_DIR/flame_spell $GSH_HOME/Castle/Main_building/Library/
+cp -r $MISSION_DIR/cheater $GSH_HOME/Castle/Main_building/Library/
+cp -r $MISSION_DIR/beer $GSH_HOME/Castle/Main_building/Library/
+
+cp $MISSION_DIR/truth_spell $GSH_TMP
+cp $MISSION_DIR/glowing_finger_spell $GSH_TMP
+cp $MISSION_DIR/flame_spell $GSH_TMP
+cp -r $MISSION_DIR/cheater $GSH_TMP
+cp -r $MISSION_DIR/beer $GSH_TMP
+
+cp $MISSION_DIR/amplifier_conflict_fixed $GSH_TMP
+
+cp $MISSION_DIR/clone.sh $GSH_TMP
+cp $MISSION_DIR/clean.sh $GSH_TMP
+cp $MISSION_DIR/add_remote_origin.sh $GSH_TMP
+cp $MISSION_DIR/remove_init_branches.sh $GSH_TMP
+cp -r $MISSION_DIR/solution_repo $GSH_TMP
+
diff --git a/missions/contrib/git_basics/00_needed_files/truth_spell b/missions/contrib/git_basics/00_needed_files/truth_spell
new file mode 100644
index 000000000..37dd961f9
--- /dev/null
+++ b/missions/contrib/git_basics/00_needed_files/truth_spell
@@ -0,0 +1,8 @@
+85 111
+5 222
+5 66
+5 11
+
+NB:
+This Spell can be used only in the presence of a spoon
+
diff --git a/missions/contrib/git_basics/01_create_newrepo/_test.sh b/missions/contrib/git_basics/01_create_newrepo/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/01_create_newrepo/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/01_create_newrepo/_treasure-msg.txt b/missions/contrib/git_basics/01_create_newrepo/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/01_create_newrepo/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/01_create_newrepo/_treasure.sh b/missions/contrib/git_basics/01_create_newrepo/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/01_create_newrepo/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/01_create_newrepo/auto.sh b/missions/contrib/git_basics/01_create_newrepo/auto.sh
new file mode 100644
index 000000000..a7dc9488c
--- /dev/null
+++ b/missions/contrib/git_basics/01_create_newrepo/auto.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/
+. $GSH_TMP/clone.sh &> /dev/null
+. $GSH_TMP/remove_init_branches.sh &> /dev/null
+gsh check
diff --git a/missions/contrib/git_basics/01_create_newrepo/check.sh b/missions/contrib/git_basics/01_create_newrepo/check.sh
new file mode 100644
index 000000000..b404a87d2
--- /dev/null
+++ b/missions/contrib/git_basics/01_create_newrepo/check.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  # verifier que le repertoire existe et est un depot git
+
+  if [ ! -d "$GSH_HOME/Castle/Portals/spellbook" ]
+  then 
+    echo " There is no spellbook Forlder in Castle/Portals "
+    return 1
+  else
+    echo " The repository spellbook exists"
+  fi
+
+  if [ ! -d $GSH_HOME/Castle/Portals/spellbook/.git ]
+  then 
+    echo " The repository spellbook is not a git repository"
+    return 1
+  else
+    echo " The repository spellbook is a git repository "
+  fi
+
+  # Store the address of the fork of the user in $GSH_TMP to set it properly in the following init
+  cd $GSH_HOME/Castle/Portals/spellbook
+  url=$(LANG=GB git remote show origin | grep "Push  URL" | tr -s ' ' | cut -d ' ' -f 4)
+  echo $url > $GSH_TMP/origin_url
+
+  # bring the user back in the previous directory
+  cd -
+
+  return 0 
+}
+_mission_check
diff --git a/missions/contrib/git_basics/01_create_newrepo/clean.sh b/missions/contrib/git_basics/01_create_newrepo/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/01_create_newrepo/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/01_create_newrepo/goal.txt b/missions/contrib/git_basics/01_create_newrepo/goal.txt
new file mode 100644
index 000000000..c846ab3ca
--- /dev/null
+++ b/missions/contrib/git_basics/01_create_newrepo/goal.txt
@@ -0,0 +1,40 @@
+Mission goal
+============
+
+According to the Head of the Magic Concil, some spellbooks have been altered in the past, due to avoidable mistakes. 
+
+The Head of the magic council has then sent an emmissary to your castle with an urgent request: all spells created from now on should be put on the SpellBook library (Github, gitlab...) and older ones sitting in Libraries also.
+
+When you arrived as a wizzard in your current Castle, the previous wizzard left a few spells he was working on, without synchronizing them with the SpellBook Library
+
+Saving the spell of the previous wizzard without the need of creating a spell yourself is a good training.
+
+
+
+The first step as a wizard is to craft your pair of rings (public and private ssh keys) that will allow you to authenticate without login/password to the remote repository. Equiped with your rings, you will be able to create your first spellbook (repository) and clone it locally.
+
+1. Create your pair of rings (ssh key)
+2. Upload it on your account on the interdimensional library (the remote repository git.univ-pau.fr).
+3. Create a spellbook (repository) on the interdimensional library (git.univ-pau.fr). "spellbook" should be the name of the project.
+4. Go to the Portal room of the Castle and clone your repository there
+
+
+
+Useful commands
+===============
+
+Some instructions on how to create an ssh key:
+firefox https://docs.github.com/en/authentication/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent
+
+In our case, we will let the passphrase empty, so no need to setup the ssh agent
+
+
+On creation of the repository, it is suggested to create a generic "README" file.
+
+You will also need to unprotect the main branch otherwise some missions will fail later. On the gitlab web interface, Settings => Repository => Protected branches => unprotect main branch
+
+To clone a repository:
+git clone REPOSITORY_URL
+
+Two URLs are proposed on the web interface, use the one to clone with SSH.
+
diff --git a/missions/contrib/git_basics/01_create_newrepo/static.sh b/missions/contrib/git_basics/01_create_newrepo/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_basics/01_create_newrepo/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/02a_create_newSpell/_clean.sh b/missions/contrib/git_basics/02a_create_newSpell/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/02a_create_newSpell/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/02a_create_newSpell/_test.sh b/missions/contrib/git_basics/02a_create_newSpell/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/02a_create_newSpell/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/02a_create_newSpell/_treasure-msg.txt b/missions/contrib/git_basics/02a_create_newSpell/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/02a_create_newSpell/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/02a_create_newSpell/_treasure.sh b/missions/contrib/git_basics/02a_create_newSpell/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/02a_create_newSpell/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/02a_create_newSpell/auto.sh b/missions/contrib/git_basics/02a_create_newSpell/auto.sh
new file mode 100644
index 000000000..01a66d528
--- /dev/null
+++ b/missions/contrib/git_basics/02a_create_newSpell/auto.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+cp $GSH_TMP/glowing_finger_spell .
+gsh check
diff --git a/missions/contrib/git_basics/02a_create_newSpell/check.sh b/missions/contrib/git_basics/02a_create_newSpell/check.sh
new file mode 100644
index 000000000..9a5a95333
--- /dev/null
+++ b/missions/contrib/git_basics/02a_create_newSpell/check.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+
+ if [ ! -e "$GSH_HOME/Castle/Portals/spellbook/glowing_finger_spell" ]
+    then 
+      echo " The file  glowing_finger_spell doesn't exist"
+      return 1
+    else
+    echo " The file  glowing_finger_spell  exist"
+    fi
+  cd $GSH_HOME/Castle/Portals/spellbook/
+
+  # verifier que le repertoire existe et est un depot git
+   LANG=en_GB git status | grep -e "Untracked"
+ 
+  test=$(echo $?)
+          
+  if [ $test -eq 1 ]
+    then 
+      echo " you should have some untracked file"
+      return 1
+#     else
+#         git status | grep -e "nothing to commit"
+#         test=$(echo $?)
+#           if [ ! $test ]
+#             then 
+#                echo " Good, you did not commited your modifications"
+#            return 0
+#           else 
+#            echo " You should not have commited your modifications"
+#          return 1 
+#          fi
+    fi
+   
+
+
+}
+_mission_check
diff --git a/missions/contrib/git_basics/02a_create_newSpell/clean.sh b/missions/contrib/git_basics/02a_create_newSpell/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/02a_create_newSpell/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/02a_create_newSpell/goal.txt b/missions/contrib/git_basics/02a_create_newSpell/goal.txt
new file mode 100644
index 000000000..1b1b861fb
--- /dev/null
+++ b/missions/contrib/git_basics/02a_create_newSpell/goal.txt
@@ -0,0 +1,43 @@
+Mission goal
+============
+
+
+Congratulation on getting your first spellbook.
+
+
+You will start with the Glowing Finger spell. This one is usefull when you don't have a torch closeby.
+
+The scroll for this spell contains the list of ingredients required to cast this spell.
+
+For your first synchronisation, we will go through a step by step process.
+
+Move the Glowing finger from the Castle's Library into your spellbook
+
+Then step into your spellbook (change directory)
+
+Have a look at the synchronisation state of your local book.
+
+
+Useful commands
+===============
+
+
+To show the the history of the whole repository
+git log 
+
+To show the state of your local repository, staging area and working directory
+git status 
+
+To show the difference between your working directory and the laste version in the repository (in 99% of the time, to be precise the comparison is made with the version pointed by HEAD)
+git diff
+
+
+NB
+===============
+
+Do not add, commit or push the new file.
+
+you might be asked to create a token through github you can acces the documentation using:
+
+firefox https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens
+
diff --git a/missions/contrib/git_basics/02a_create_newSpell/init.sh b/missions/contrib/git_basics/02a_create_newSpell/init.sh
new file mode 100644
index 000000000..6f57e56bc
--- /dev/null
+++ b/missions/contrib/git_basics/02a_create_newSpell/init.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/02a_create_newSpell/static.sh b/missions/contrib/git_basics/02a_create_newSpell/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_basics/02a_create_newSpell/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/02b_add_newSpell/_clean.sh b/missions/contrib/git_basics/02b_add_newSpell/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/02b_add_newSpell/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/02b_add_newSpell/_test.sh b/missions/contrib/git_basics/02b_add_newSpell/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/02b_add_newSpell/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/02b_add_newSpell/_treasure-msg.txt b/missions/contrib/git_basics/02b_add_newSpell/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/02b_add_newSpell/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/02b_add_newSpell/_treasure.sh b/missions/contrib/git_basics/02b_add_newSpell/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/02b_add_newSpell/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/02b_add_newSpell/auto.sh b/missions/contrib/git_basics/02b_add_newSpell/auto.sh
new file mode 100644
index 000000000..d762ee11c
--- /dev/null
+++ b/missions/contrib/git_basics/02b_add_newSpell/auto.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+
+cd $GSH_HOME/Castle/Portals/spellbook
+git add glowing_finger_spell 
+gsh check
+
diff --git a/missions/contrib/git_basics/02b_add_newSpell/check.sh b/missions/contrib/git_basics/02b_add_newSpell/check.sh
new file mode 100644
index 000000000..b62a79973
--- /dev/null
+++ b/missions/contrib/git_basics/02b_add_newSpell/check.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+ if [ ! -e "$GSH_HOME/Castle/Portals/spellbook/glowing_finger_spell" ]
+    then 
+      echo " The file glowing_finger_spell doesn't exist"
+      return 1
+    else
+    echo " The file glowing_finger_spell exist"
+    fi
+
+  # verifier que le repertoire existe et est un depot git
+  cd $GSH_HOME/Castle/Portals/spellbook/
+   LANG=en_GB git status | grep -e "new file:   glowing_finger_spell"
+
+test=$(echo $?)
+          
+  if [ $test -eq 0 ]
+    then 
+      echo " glowing_finger_spell is a new tracked file"
+      return 0
+    else
+
+     echo " glowing_finger_spell is not a new tracked file"
+      return 1
+    
+#         git status | grep -e "nothing to commit"
+#         test=$(echo $?)
+#           if [ ! $test ]
+#             then 
+#                echo " Good, you did not commited your modifications"
+#            return 0
+#           else 
+#            echo " You should not have commited your modifications"
+#          return 1 
+#          fi
+    fi
+   
+   
+}
+_mission_check
diff --git a/missions/contrib/git_basics/02b_add_newSpell/clean.sh b/missions/contrib/git_basics/02b_add_newSpell/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/02b_add_newSpell/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/02b_add_newSpell/goal.txt b/missions/contrib/git_basics/02b_add_newSpell/goal.txt
new file mode 100644
index 000000000..f5005b8da
--- /dev/null
+++ b/missions/contrib/git_basics/02b_add_newSpell/goal.txt
@@ -0,0 +1,27 @@
+Mission goal
+============
+
+So as you can see with `git status`, the new spell is not being tracked by the portal system yet.
+
+
+Add the file to the staging area and check what is the output of `git status` now
+
+
+Useful commands
+===============
+
+To add a file or modifications of a file to the staging area
+
+git add FILE_NAME
+
+
+To show the state of your local repository, staging area and working directory
+git status 
+
+
+
+NB
+===============
+
+Do not commit or push the file.
+
diff --git a/missions/contrib/git_basics/02b_add_newSpell/init.sh b/missions/contrib/git_basics/02b_add_newSpell/init.sh
new file mode 100644
index 000000000..b28a2b69e
--- /dev/null
+++ b/missions/contrib/git_basics/02b_add_newSpell/init.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+    cp $GSH_TMP/glowing_finger_spell .
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/02b_add_newSpell/static.sh b/missions/contrib/git_basics/02b_add_newSpell/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_basics/02b_add_newSpell/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/02c_commit_newSpell/_clean.sh b/missions/contrib/git_basics/02c_commit_newSpell/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/02c_commit_newSpell/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/02c_commit_newSpell/_test.sh b/missions/contrib/git_basics/02c_commit_newSpell/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/02c_commit_newSpell/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/02c_commit_newSpell/_treasure-msg.txt b/missions/contrib/git_basics/02c_commit_newSpell/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/02c_commit_newSpell/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/02c_commit_newSpell/_treasure.sh b/missions/contrib/git_basics/02c_commit_newSpell/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/02c_commit_newSpell/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/02c_commit_newSpell/auto.sh b/missions/contrib/git_basics/02c_commit_newSpell/auto.sh
new file mode 100644
index 000000000..543211440
--- /dev/null
+++ b/missions/contrib/git_basics/02c_commit_newSpell/auto.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+# recreate properly main branch on the remote before doing the commit otherwise status does not show the correct message
+git push -u origin main
+git commit -m 'glowing finger spell added'
+gsh check
diff --git a/missions/contrib/git_basics/02c_commit_newSpell/check.sh b/missions/contrib/git_basics/02c_commit_newSpell/check.sh
new file mode 100644
index 000000000..6eb9d3450
--- /dev/null
+++ b/missions/contrib/git_basics/02c_commit_newSpell/check.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  if [ ! -e "$GSH_HOME/Castle/Portals/spellbook/glowing_finger_spell" ]
+  then 
+    echo " The file  glowing_finger_spell doesn't exist"
+    return 1
+  else
+    echo " The file  glowing_finger_spell  exist"
+  fi
+  cd $GSH_HOME/Castle/Portals/spellbook/
+
+  LANG=en_GB git status | grep -e "Changes to be committed:"
+
+  if [ $? -eq 0 ]
+  then 
+    echo " you should not have changes to commit any more"
+    return 1
+  fi
+
+
+  LANG=en_GB git status | grep -e "Your branch is ahead of"
+
+  if [ $? -eq 1 ]
+  then
+    echo " you should have changes to push"
+    return 1
+  fi
+
+  return 0
+   
+}
+_mission_check
diff --git a/missions/contrib/git_basics/02c_commit_newSpell/clean.sh b/missions/contrib/git_basics/02c_commit_newSpell/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/02c_commit_newSpell/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/02c_commit_newSpell/goal.txt b/missions/contrib/git_basics/02c_commit_newSpell/goal.txt
new file mode 100644
index 000000000..90f1f5daf
--- /dev/null
+++ b/missions/contrib/git_basics/02c_commit_newSpell/goal.txt
@@ -0,0 +1,31 @@
+Mission goal
+============
+
+Indeed, the spell is now tracked but not synchronised yet. 
+
+Before synchronisation, you need to create a snapshot of your spell in your local spellbook, in the portal room. 
+
+Have a look at the state of the synchronisation again
+
+Useful commands
+===============
+
+To create a snaphot of for all the staged modifications as a new version of your code
+
+git commit -m 'COMMIT_MESSAGE'
+
+
+To show the the history of the whole repository
+git log 
+
+To show the state of your local repository, staging area and working directory
+git status 
+
+To show the difference between your working directory and the laste version in the repository (in 99% of the time, to be precise the comparison is made with the version pointed by HEAD)
+git diff
+
+
+NB
+===============
+
+Do not push the new file.
diff --git a/missions/contrib/git_basics/02c_commit_newSpell/init.sh b/missions/contrib/git_basics/02c_commit_newSpell/init.sh
new file mode 100644
index 000000000..a2a8a1b45
--- /dev/null
+++ b/missions/contrib/git_basics/02c_commit_newSpell/init.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+    cp $GSH_TMP/glowing_finger_spell .
+    git add glowing_finger_spell 
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/02c_commit_newSpell/static.sh b/missions/contrib/git_basics/02c_commit_newSpell/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_basics/02c_commit_newSpell/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/02d_push_newSpell/_clean.sh b/missions/contrib/git_basics/02d_push_newSpell/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/02d_push_newSpell/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/02d_push_newSpell/_test.sh b/missions/contrib/git_basics/02d_push_newSpell/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/02d_push_newSpell/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/02d_push_newSpell/_treasure-msg.txt b/missions/contrib/git_basics/02d_push_newSpell/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/02d_push_newSpell/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/02d_push_newSpell/_treasure.sh b/missions/contrib/git_basics/02d_push_newSpell/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/02d_push_newSpell/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/02d_push_newSpell/auto.sh b/missions/contrib/git_basics/02d_push_newSpell/auto.sh
new file mode 100644
index 000000000..811ce9e31
--- /dev/null
+++ b/missions/contrib/git_basics/02d_push_newSpell/auto.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+git push
+gsh check
diff --git a/missions/contrib/git_basics/02d_push_newSpell/check.sh b/missions/contrib/git_basics/02d_push_newSpell/check.sh
new file mode 100644
index 000000000..7eefcafc5
--- /dev/null
+++ b/missions/contrib/git_basics/02d_push_newSpell/check.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+  cd $GSH_HOME/Castle/Portals/spellbook/
+
+    LANG=en_GB git status | grep -e "up to date with"
+test=$(echo $?)
+          
+  if [ $test -eq 1 ]
+    then 
+      echo " You did not pushed all of your modifications"
+      return 1
+    else
+      cd $GSH_HOME/Castle/Portals/spellbook/
+
+       LANG=en_GB git status | grep -e "Changes to be committed:"
+       test=$(echo $?)
+      
+       if [ $test -eq 0 ]
+          then 
+            echo " You did not commited all of your modifications"
+            return 1
+         else 
+           echo " You did pushed all of your modifications"
+           return 0 
+       fi
+    fi
+   
+}
+_mission_check
diff --git a/missions/contrib/git_basics/02d_push_newSpell/clean.sh b/missions/contrib/git_basics/02d_push_newSpell/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/02d_push_newSpell/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/02d_push_newSpell/goal.txt b/missions/contrib/git_basics/02d_push_newSpell/goal.txt
new file mode 100644
index 000000000..cf9d2e528
--- /dev/null
+++ b/missions/contrib/git_basics/02d_push_newSpell/goal.txt
@@ -0,0 +1,26 @@
+Mission goal
+============
+
+That's it, your spell is ready for synchronisation.
+
+
+Now push everything through the portal system.
+
+And have a look again at the state of the synchronisation
+
+Useful commands
+===============
+
+To push all commits of the local repository to the remote one
+git push
+
+
+To show the the history of the whole repository
+git log 
+
+To show the state of your local repository, staging area and working directory
+git status 
+
+To show the difference between your working directory and the laste version in the repository (in 99% of the time, to be precise the comparison is made with the version pointed by HEAD)
+git diff
+
diff --git a/missions/contrib/git_basics/02d_push_newSpell/init.sh b/missions/contrib/git_basics/02d_push_newSpell/init.sh
new file mode 100644
index 000000000..dfd27cad4
--- /dev/null
+++ b/missions/contrib/git_basics/02d_push_newSpell/init.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git reset --hard origin/glowing_finger_spell_added &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/02d_push_newSpell/static.sh b/missions/contrib/git_basics/02d_push_newSpell/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_basics/02d_push_newSpell/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/02d_push_newSpell/treasure.sh b/missions/contrib/git_basics/02d_push_newSpell/treasure.sh
new file mode 100644
index 000000000..7b6b768bb
--- /dev/null
+++ b/missions/contrib/git_basics/02d_push_newSpell/treasure.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+# Script pour afficher la main ASCII avec l'index marqué et une aura circulaire
+
+HIDE="\e[?25l"
+SHOW="\e[?25h"
+
+DURATION=3       # Durée totale de l'animation en secondes
+INTERVAL=0.3     # Intervalle entre les frames
+
+# Main ASCII
+HAND_BASE="\
+    ____ ____ ____ ____  
+   |    |    |    | O  |  
+   |____|____|____|____|  
+   |    |    |    |    |  
+   |    |    |    |    |  
+   |    |    |    |    |  
+   |    |    |    |    |_______  
+   |                           |  
+   |                     ______|  
+   |                    |  
+   |                    |  
+   |                    |  
+   |____________________|"
+
+# Frames pour l'aura circulaire autour de l'index
+AURA_FRAMES=(
+"                   *** 
+                  * * *
+                   ***"
+"                    *  
+                   *O* 
+                    *"
+"                   * * 
+                  * O *
+                   * *"
+)
+
+trap "printf '${SHOW}\n'; exit" INT TERM
+
+printf "$HIDE"
+END=$((SECONDS+DURATION))
+
+while [ $SECONDS -lt $END ]; do
+    for aura in "${AURA_FRAMES[@]}"; do
+        clear
+        # Affiche l'aura au-dessus et autour du troisième doigt (index)
+        echo -e "$aura"
+        echo -e "$HAND_BASE"
+        sleep $INTERVAL
+    done
+done
+
+printf "$SHOW"
+
+
diff --git a/missions/contrib/git_basics/03_second_spell_add_commit_push/_clean.sh b/missions/contrib/git_basics/03_second_spell_add_commit_push/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/03_second_spell_add_commit_push/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/03_second_spell_add_commit_push/_test.sh b/missions/contrib/git_basics/03_second_spell_add_commit_push/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/03_second_spell_add_commit_push/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/03_second_spell_add_commit_push/_treasure-msg.txt b/missions/contrib/git_basics/03_second_spell_add_commit_push/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/03_second_spell_add_commit_push/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/03_second_spell_add_commit_push/_treasure.sh b/missions/contrib/git_basics/03_second_spell_add_commit_push/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/03_second_spell_add_commit_push/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/03_second_spell_add_commit_push/auto.sh b/missions/contrib/git_basics/03_second_spell_add_commit_push/auto.sh
new file mode 100644
index 000000000..84b3edfd5
--- /dev/null
+++ b/missions/contrib/git_basics/03_second_spell_add_commit_push/auto.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+cp $GSH_TMP/truth_spell .
+git add truth_spell
+git commit -m "truth spell added"
+git push
+gsh check
+
diff --git a/missions/contrib/git_basics/03_second_spell_add_commit_push/check.sh b/missions/contrib/git_basics/03_second_spell_add_commit_push/check.sh
new file mode 100644
index 000000000..c1a525630
--- /dev/null
+++ b/missions/contrib/git_basics/03_second_spell_add_commit_push/check.sh
@@ -0,0 +1,70 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+
+
+ if [ ! -e "$GSH_HOME/Castle/Portals/spellbook" ]
+    then 
+      echo " spellbook doesn't exist"
+      return 1
+    else
+    echo " spellbook  exist"
+    fi
+
+ if [ ! -e "$GSH_HOME/Castle/Portals/spellbook/truth_spell" ]
+    then 
+      echo " The file  truth_spell doesn't exist"
+      return 1
+    else
+    echo " The file truth_spell  exist"
+    fi
+
+  # verifier que le repertoire existe et est un depot git
+  cd $GSH_HOME/Castle/Portals/spellbook/
+
+LANG=en_GB git status | grep -e "Untracked"
+ 
+  test=$(echo $?)
+          
+  if [ $test -eq 0 ]
+    then 
+      echo " you should not have untracked file"
+      return 1
+  fi
+   
+
+    LANG=en_GB git status | grep -e "up to date with"
+test=$(echo $?)
+          
+  if [ $test -eq 1 ]
+    then 
+      echo " You did not pushed all of your modifications"
+      return 1
+    else
+      cd $GSH_HOME/Castle/Portals/spellbook/
+
+       LANG=en_GB git status | grep -e "Changes to be committed:"
+       test=$(echo $?)
+      
+       if [ $test -eq 0 ]
+          then 
+            echo " You did not commited all of your modifications"
+            return 1
+         else 
+           echo " You did pushed all of your modifications"
+           return 0 
+       fi
+    fi
+}
+_mission_check
diff --git a/missions/contrib/git_basics/03_second_spell_add_commit_push/clean.sh b/missions/contrib/git_basics/03_second_spell_add_commit_push/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/03_second_spell_add_commit_push/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/03_second_spell_add_commit_push/goal.txt b/missions/contrib/git_basics/03_second_spell_add_commit_push/goal.txt
new file mode 100644
index 000000000..ea423b9bf
--- /dev/null
+++ b/missions/contrib/git_basics/03_second_spell_add_commit_push/goal.txt
@@ -0,0 +1,18 @@
+Mission goal
+============
+
+You now have a good idea of the synchronisation process.
+
+You can now synchronisze the spell of truth (truth_spell) as you did for the glowing finger spell.
+
+
+
+Useful commands
+===============
+
+git add FILENAME : start tracking the file FILENAME or add its modification to the staging area
+
+git commit -m 'COMMIT_MESSAGE'
+
+git push 
+
diff --git a/missions/contrib/git_basics/03_second_spell_add_commit_push/init.sh b/missions/contrib/git_basics/03_second_spell_add_commit_push/init.sh
new file mode 100644
index 000000000..dfd27cad4
--- /dev/null
+++ b/missions/contrib/git_basics/03_second_spell_add_commit_push/init.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git reset --hard origin/glowing_finger_spell_added &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/03_second_spell_add_commit_push/static.sh b/missions/contrib/git_basics/03_second_spell_add_commit_push/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_basics/03_second_spell_add_commit_push/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/03_second_spell_add_commit_push/treasure.sh b/missions/contrib/git_basics/03_second_spell_add_commit_push/treasure.sh
new file mode 100644
index 000000000..e445816b3
--- /dev/null
+++ b/missions/contrib/git_basics/03_second_spell_add_commit_push/treasure.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+MSG="There is no spoon"
+
+clear
+tput civis  # cacher le curseur
+
+# dimensions du terminal
+LINES=$(tput lines)
+COLS=$(tput cols)
+
+# position du texte
+row=$((LINES/2))
+col=$(( (COLS-${#MSG})/2 ))
+
+start=$(date +%s)
+
+while true; do
+    now=$(date +%s)
+    elapsed=$((now - start))
+    if [ $elapsed -ge 4 ]; then
+        break
+    fi
+
+    clear
+
+    # afficher le message centré
+    tput cup $row $col
+    echo -e "\033[1;97m$MSG\033[0m"
+
+    # dessiner quelques étincelles aléatoires autour
+    for i in {1..20}; do
+        y=$((row-3+RANDOM%7))
+        x=$((col-5+RANDOM%(${#MSG}+10)))
+        sym=("." "*" "o" "O" "+")
+        c=${sym[$RANDOM%${#sym[@]}]}
+        color=$((31+RANDOM%7))
+        tput cup $y $x
+        echo -ne "\033[1;${color}m$c\033[0m"
+    done
+
+    sleep 0.1
+done
+
+# restauration du curseur
+tput cnorm
+
+# replacer le message final sans effacer l'écran
+tput cup $row $col
+echo -e "\033[1;97m$MSG\033[0m"
+
+# ajouter 5 lignes vides puis retour à la ligne
+for i in {1..7}; do
+    echo ""
+done
+
diff --git a/missions/contrib/git_basics/04_third_spell_branch/_clean.sh b/missions/contrib/git_basics/04_third_spell_branch/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/04_third_spell_branch/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/04_third_spell_branch/_test.sh b/missions/contrib/git_basics/04_third_spell_branch/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/04_third_spell_branch/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/04_third_spell_branch/_treasure-msg.txt b/missions/contrib/git_basics/04_third_spell_branch/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/04_third_spell_branch/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/04_third_spell_branch/_treasure.sh b/missions/contrib/git_basics/04_third_spell_branch/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/04_third_spell_branch/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/04_third_spell_branch/auto.sh b/missions/contrib/git_basics/04_third_spell_branch/auto.sh
new file mode 100644
index 000000000..890ffbc36
--- /dev/null
+++ b/missions/contrib/git_basics/04_third_spell_branch/auto.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+cp $GSH_TMP/flame_spell .
+git checkout -b flame
+git add flame_spell
+git commit -m "flame spell added"
+gsh check
+
diff --git a/missions/contrib/git_basics/04_third_spell_branch/check.sh b/missions/contrib/git_basics/04_third_spell_branch/check.sh
new file mode 100644
index 000000000..ad50db468
--- /dev/null
+++ b/missions/contrib/git_basics/04_third_spell_branch/check.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+
+  expected_name="flame"
+  spell_name=${expected_name}_spell
+
+  if [ ! -e "$GSH_HOME/Castle/Portals/spellbook" ]
+  then 
+    echo " spellbook doesn't exist"
+    return 1
+  else
+    echo " spellbook  exists"
+  fi
+
+  cd $GSH_HOME/Castle/Portals/spellbook/
+
+  search=$(find -name $spell_name)
+  if [ $search = "" ]
+  then 
+    echo " The file $spell_name doesn't exist"
+    return 1
+  else
+    echo " The file $spell_name exists"
+  fi
+
+
+  LANG=en_GB git status | grep -e "Untracked"
+
+  test=$(echo $?)
+
+  if [ $test -eq 0 ]
+  then 
+    echo " you should not have untracked file"
+    return 1
+  fi
+
+  branch_created=$(git branch | grep $expected_name)
+  if [ "$branch_created" = "" ]
+  then
+    echo "Branch $expected_name is not available..."
+    return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != $expected_name ]
+  then
+    echo "You are not on the $expected_name branch..."
+    return 1
+  fi
+
+  main_id=$(git rev-parse main)
+  target_id=$(git rev-parse $expected_name)
+  if [ "$main_id" = "$target_id" ]
+  then
+    echo "You did not commit anything, main and $expected_name branches are pointing on the same commit..."
+    return 1
+  fi
+
+  spell=$(git ls-tree flame $spell_name)
+  spell2=$(git ls-tree flame Chapter_1/$spell_name)
+
+  if [ "$spell" = "" ] && [ "$spell2" = "" ]
+  then
+    echo "Spell $spell_name not in repository, at least not on $expected_name branch..."
+    return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_basics/04_third_spell_branch/clean.sh b/missions/contrib/git_basics/04_third_spell_branch/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/04_third_spell_branch/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/04_third_spell_branch/goal.txt b/missions/contrib/git_basics/04_third_spell_branch/goal.txt
new file mode 100644
index 000000000..bdac4ef12
--- /dev/null
+++ b/missions/contrib/git_basics/04_third_spell_branch/goal.txt
@@ -0,0 +1,22 @@
+Mission goal
+============
+
+Excellent !
+
+Let us do the same process again with the flame spell. This time you are not sure to integrate it directly in the main version of your spellbook, so you will add the spell on a branch called flame.
+
+Useful commands
+===============
+
+To create a branch:
+git branch BRANCH_NAME [TREE_ISH]
+TREE_ISH is optional, by default it is HEAD, but one can put here a commit identifier, a branch name, a tag, ..., anything that refers to a commit
+
+To start tracking the file FILENAME or add its modification to the staging area:
+git add FILENAME
+
+To create a commit with a COMMIT_MESSAGE as comment for the commit:
+git commit -m 'COMMIT_MESSAGE'
+
+To move HEAD on a branch (and update the working directory accordingly)
+git checkout BRANCH_NAME
diff --git a/missions/contrib/git_basics/04_third_spell_branch/init.sh b/missions/contrib/git_basics/04_third_spell_branch/init.sh
new file mode 100644
index 000000000..7f179b1b5
--- /dev/null
+++ b/missions/contrib/git_basics/04_third_spell_branch/init.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git reset --hard origin/moving_spell_into_Chapter_1 &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/04_third_spell_branch/static.sh b/missions/contrib/git_basics/04_third_spell_branch/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_basics/04_third_spell_branch/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/04_third_spell_branch/treasure.sh b/missions/contrib/git_basics/04_third_spell_branch/treasure.sh
new file mode 100644
index 000000000..3b2f38725
--- /dev/null
+++ b/missions/contrib/git_basics/04_third_spell_branch/treasure.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# Couleurs ANSI
+RED='\033[0;31m'
+ORANGE='\033[38;5;208m'
+YELLOW='\033[1;33m'
+RESET='\033[0m'
+
+frames=(
+"${RED}             .          ${RESET}\n\
+${ORANGE}           .oOo.        ${RESET}\n\
+${YELLOW}         .oOOOOOo.      ${RESET}\n\
+${RED}       .oOOOOOOOOOo.     ${RESET}\n\
+${ORANGE}     .oOOOOOOOOOOOOOo.${RESET}\n\
+${YELLOW}    .oOOOOOOOOOOOOOOOo.${RESET}\n\
+${RED}   .oOOOOOOOOOOOOOOOOOo.${RESET}\n\
+${ORANGE}    .oOOOOOOOOOOOOOOOo.${RESET}\n\
+${YELLOW}     .oOOOOOOOOOOOOOo.${RESET}\n\
+${RED}      .oOOOOOOOOOOOo.${RESET}\n\
+${ORANGE}       .oOOOOOOOOOo.${RESET}\n\
+${YELLOW}        .oOOOOOOOo.${RESET}\n\
+${RED}         .oOOOOOo.${RESET}\n\
+${ORANGE}          .oOOOo.${RESET}\n\
+${YELLOW}          .oOOOo.${RESET}\n\
+${RED}          .oOOOo.${RESET}\n\
+${ORANGE}          .oOOOo.${RESET}\n\
+${RED}           .oOo.${RESET}\n\
+${RED}                      ${RESET}"
+)
+
+clear
+for f in "${frames[@]}"; do
+  printf "%b\n" "$f"
+done
+
diff --git a/missions/contrib/git_basics/05_fifth_spell/_clean.sh b/missions/contrib/git_basics/05_fifth_spell/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/05_fifth_spell/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/05_fifth_spell/_test.sh b/missions/contrib/git_basics/05_fifth_spell/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/05_fifth_spell/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/05_fifth_spell/_treasure-msg.txt b/missions/contrib/git_basics/05_fifth_spell/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/05_fifth_spell/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/05_fifth_spell/_treasure.sh b/missions/contrib/git_basics/05_fifth_spell/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/05_fifth_spell/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/05_fifth_spell/auto.sh b/missions/contrib/git_basics/05_fifth_spell/auto.sh
new file mode 100644
index 000000000..c836d1483
--- /dev/null
+++ b/missions/contrib/git_basics/05_fifth_spell/auto.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+cp $GSH_TMP/cheater/* .
+git co -b cheater main
+git add cheater_spell
+git add amplifier
+git ci -m "cheater spell added"
+
+gsh check
+
diff --git a/missions/contrib/git_basics/05_fifth_spell/check.sh b/missions/contrib/git_basics/05_fifth_spell/check.sh
new file mode 100644
index 000000000..4aee1afd4
--- /dev/null
+++ b/missions/contrib/git_basics/05_fifth_spell/check.sh
@@ -0,0 +1,109 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+
+  expected_name="cheater"
+  spell_name=${expected_name}_spell
+
+  if [ ! -e "$GSH_HOME/Castle/Portals/spellbook" ]
+  then 
+    echo " spellbook doesn't exist"
+    return 1
+  fi
+
+  cd $GSH_HOME/Castle/Portals/spellbook/
+
+  search=$(find -name $spell_name)
+  if [ $search = "" ]
+  then 
+    echo " The file $spell_name doesn't exist"
+    return 1
+  else
+    echo " The file $spell_name exists"
+  fi
+
+  search=$(find -name amplifier)
+  if [ $search = "" ]
+  then 
+    echo " The file amplifier doesn't exist"
+    return 1
+  else
+    echo " The file amplifier exists"
+  fi
+
+  LANG=en_GB git status | grep -e "Untracked"
+
+  test=$(echo $?)
+
+  if [ $test -eq 0 ]
+  then 
+    echo " you should not have untracked file"
+    return 1
+  fi
+
+  branch_created=$(git branch | grep $expected_name)
+  if [ "$branch_created" = "" ]
+  then
+    echo "Branch $expected_name does not exist..."
+    return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != $expected_name ]
+  then
+    echo "You are not on the $expected_name branch..."
+    return 1
+  fi
+
+  # check if branches are not pointing at the same commit
+  main_id=$(git rev-parse main)
+  target_id=$(git rev-parse $expected_name)
+  if [ "$main_id" = "$target_id" ]
+  then
+    echo "You did not commit anything, main and $expected_name branches are pointing on the same commit..."
+    return 1
+  fi
+
+  # check if files are in the repo
+  spell=$(git ls-tree $expected_name $spell_name)
+  spell2=$(git ls-tree $expected_name Chapter_1/$spell_name)
+
+  if [ "$spell" = "" ] && [ "$spell2" = "" ]
+  then
+    echo "Spell $spell_name not in repository, at least not on $expected_name branch..."
+    return 1
+  fi
+
+  amplifier=$(git ls-tree $expected_name amplifier)
+  amplifier2=$(git ls-tree $expected_name Chapter_1/amplifier)
+  if [ "$amplifier" = "" ] && [ "$amplifier2" = "" ]
+  then
+    echo "Amplifier not in repository, at least not on $expected_name branch..."
+    return 1
+  fi
+
+  #check if flame branch is in the history of cheater
+  flame_id=$(git rev-parse flame)
+  output=$(git log | grep $flame_id)
+  if [ "$output" != "" ]
+  then
+    echo "Flame branch is an ancestor of $expected_name branch but should not. You probably did not start the branch from main..."
+    return 1
+  fi
+
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_basics/05_fifth_spell/clean.sh b/missions/contrib/git_basics/05_fifth_spell/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/05_fifth_spell/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/05_fifth_spell/goal.txt b/missions/contrib/git_basics/05_fifth_spell/goal.txt
new file mode 100644
index 000000000..0f027264a
--- /dev/null
+++ b/missions/contrib/git_basics/05_fifth_spell/goal.txt
@@ -0,0 +1,21 @@
+Mission goal
+============
+
+Good, let us move on with yet another spell, the cheater spell that helps students to increase their marks !
+
+Again you are not sure to integrate it directly in the main version of your spellbook, so you will add the spell on a branch called cheater CREATED FROM the main branch.
+
+Caution: without amplifier, the spell only increases the mark by one, so copy the spell file and the amplifier in your spell book (and not the entire directory).
+
+Useful commands
+===============
+
+To create a branch:
+git branch BRANCH_NAME [TREE_ISH]
+TREE_ISH is optional, by default it is HEAD, but one can put here a commit identifier, a branch name, a tag, ..., anything that refers to a commit
+
+To start tracking the file FILENAME or add its modification to the staging area:
+git add FILENAME
+
+To create a commit with a COMMIT_MESSAGE as comment for the commit:
+git commit -m 'COMMIT_MESSAGE'
diff --git a/missions/contrib/git_basics/05_fifth_spell/init.sh b/missions/contrib/git_basics/05_fifth_spell/init.sh
new file mode 100644
index 000000000..f8b74d90f
--- /dev/null
+++ b/missions/contrib/git_basics/05_fifth_spell/init.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git branch flame origin/flame_added &> /dev/null
+    git checkout flame &> /dev/null
+    git branch -f main origin/moving_spell_into_Chapter_1 &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/05_fifth_spell/static.sh b/missions/contrib/git_basics/05_fifth_spell/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_basics/05_fifth_spell/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/05_fifth_spell/treasure.sh b/missions/contrib/git_basics/05_fifth_spell/treasure.sh
new file mode 100644
index 000000000..cdb6b2999
--- /dev/null
+++ b/missions/contrib/git_basics/05_fifth_spell/treasure.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+# Initial and final grade
+grade=4
+final_grade=15
+
+# ANSI color codes
+RED="\033[31m"
+YELLOW="\033[33m"
+GREEN="\033[32m"
+RESET="\033[0m"
+
+# Function to generate a random spark line of given length
+spark_line() {
+    length=$1
+    line=""
+    for i in $(seq 1 $length); do
+        r=$((RANDOM % 6))
+        if [ $r -eq 0 ]; then
+            line="${line}*"
+        elif [ $r -eq 1 ]; then
+            line="${line}+"
+        elif [ $r -eq 2 ]; then
+            line="${line}o"
+        elif [ $r -eq 3 ]; then
+            line="${line}~"
+        else
+            line="${line} "
+        fi
+    done
+    echo "$line"
+}
+
+# Function to get color for grade
+grade_color() {
+    if [ $1 -lt 7 ]; then
+        echo -e "$RED"
+    elif [ $1 -le 12 ]; then
+        echo -e "$YELLOW"
+    else
+        echo -e "$GREEN"
+    fi
+}
+
+# Function to draw the bigger scroll with sparks around the grade
+draw_scroll() {
+    clear
+
+    scroll_width=50
+    spark_width=$((scroll_width - 4))
+
+    echo "    _________________________________________________"
+    echo "   /                                                 \\"
+    echo "  /               Increasing mark                    \\"
+    echo " |                                                   |"
+    echo " |                                                   |"
+
+    # Sparks above the grade
+    echo " |  $(spark_line $spark_width)   |"
+
+    # The grade line with sparks on both sides
+    side_spark_left=$(spark_line $(( (spark_width-5)/2 )) )
+    side_spark_right=$(spark_line $(( (spark_width-5)/2 )) )
+    color=$(grade_color $grade)
+    printf " |  %s %b%2d/20%b %s  |\n" "$side_spark_left" "$color" "$grade" "$RESET" "$side_spark_right"
+
+    # Sparks below the grade
+    echo " |  $(spark_line $spark_width)   |"
+
+    # Extra empty lines for bigger scroll
+    for i in {1..4}; do
+        echo " |                                                   |"
+    done
+
+    echo " \\___________________________________________________/"
+}
+
+# Animation: increase the grade
+while [ $grade -le $final_grade ]; do
+    draw_scroll
+    grade=$((grade + 1))
+    sleep 0.3
+done
+
+# Final display
+clear
+echo "    ______________________________________________"
+echo "   /                                              \\"
+echo "  /               Increasing mark                    \\"
+echo " |                                                |"
+echo " |                                                |"
+echo " |                                                |"
+echo " |                                                |"
+echo " |                                                |"
+echo " |                                                |"
+final_color=$(grade_color $final_grade)
+echo -e " |                  ${final_color}$final_grade/20${RESET}                         |"
+echo " |                                                |"
+echo " \\________________________________________________/"
+
diff --git a/missions/contrib/git_basics/06_sixth_spell/.auto.sh.swo b/missions/contrib/git_basics/06_sixth_spell/.auto.sh.swo
new file mode 100644
index 000000000..e32d39ae9
Binary files /dev/null and b/missions/contrib/git_basics/06_sixth_spell/.auto.sh.swo differ
diff --git a/missions/contrib/git_basics/06_sixth_spell/_clean.sh b/missions/contrib/git_basics/06_sixth_spell/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/06_sixth_spell/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/06_sixth_spell/_test.sh b/missions/contrib/git_basics/06_sixth_spell/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/06_sixth_spell/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/06_sixth_spell/_treasure-msg.txt b/missions/contrib/git_basics/06_sixth_spell/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/06_sixth_spell/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/06_sixth_spell/_treasure.sh b/missions/contrib/git_basics/06_sixth_spell/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/06_sixth_spell/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/06_sixth_spell/auto.sh b/missions/contrib/git_basics/06_sixth_spell/auto.sh
new file mode 100644
index 000000000..d1cf62c8d
--- /dev/null
+++ b/missions/contrib/git_basics/06_sixth_spell/auto.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+git co -b beer main
+cp $GSH_TMP/beer/* .
+git add beer_spell
+git add amplifier
+git ci -m "beer spell added"
+
+gsh check
+
diff --git a/missions/contrib/git_basics/06_sixth_spell/check.sh b/missions/contrib/git_basics/06_sixth_spell/check.sh
new file mode 100644
index 000000000..30894f63b
--- /dev/null
+++ b/missions/contrib/git_basics/06_sixth_spell/check.sh
@@ -0,0 +1,117 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+
+  expected_name="beer"
+  spell_name=${expected_name}_spell
+
+  if [ ! -e "$GSH_HOME/Castle/Portals/spellbook" ]
+  then 
+    echo " spellbook doesn't exist"
+    return 1
+  fi
+
+  cd $GSH_HOME/Castle/Portals/spellbook/
+
+  search=$(find -name $spell_name)
+  if [ $search = "" ]
+  then 
+    echo " The file $spell_name doesn't exist"
+    return 1
+  else
+    echo " The file $spell_name exists"
+  fi
+
+  search=$(find -name amplifier)
+  if [ $search = "" ]
+  then 
+    echo " The file amplifier doesn't exist"
+    return 1
+  else
+    echo " The file amplifier exists"
+  fi
+
+  LANG=en_GB git status | grep -e "Untracked"
+
+  test=$(echo $?)
+
+  if [ $test -eq 0 ]
+  then 
+    echo " you should not have untracked file"
+    return 1
+  fi
+
+  branch_created=$(git branch | grep $expected_name)
+  if [ "$branch_created" = "" ]
+  then
+    echo "Branch $expected_name does not exist..."
+    return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != $expected_name ]
+  then
+    echo "You are not on the $expected_name branch..."
+    return 1
+  fi
+
+  # check if branches are not pointing at the same commit
+  main_id=$(git rev-parse main)
+  target_id=$(git rev-parse $expected_name)
+  if [ "$main_id" = "$target_id" ]
+  then
+    echo "You did not commit anything, main and $expected_name branches are pointing on the same commit..."
+    return 1
+  fi
+
+  # check if files are in the repo
+  spell=$(git ls-tree $expected_name $spell_name)
+  spell2=$(git ls-tree $expected_name Chapter_1/$spell_name)
+
+  if [ "$spell" = "" ] && [ "$spell2" = "" ]
+  then
+    echo "Spell $spell_name not in repository, at least not on $expected_name branch..."
+    return 1
+  fi
+
+  amplifier=$(git ls-tree $expected_name amplifier)
+  amplifier2=$(git ls-tree $expected_name Chapter_1/amplifier)
+  if [ "$amplifier" = "" ] && [ "$amplifier2" = "" ]
+  then
+    echo "Amplifier not in repository, at least not on $expected_name branch..."
+    return 1
+  fi
+
+  #check if flame or cheater branch are in the history of beer
+  id=$(git rev-parse flame)
+  output=$(git log | grep $id)
+  if [ "$output" != "" ]
+  then
+    echo "Flame branch is an ancestor of $expected_name branch but should not. You probably did not start the branch from main..."
+    return 1
+  fi
+
+  id=$(git rev-parse cheater)
+  output=$(git log | grep $id)
+  if [ "$output" != "" ]
+  then
+    echo "Cheater branch is an ancestor of $expected_name branch but should not. You probably did not start the branch from main..."
+    return 1
+  fi
+
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_basics/06_sixth_spell/clean.sh b/missions/contrib/git_basics/06_sixth_spell/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/06_sixth_spell/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/06_sixth_spell/goal.txt b/missions/contrib/git_basics/06_sixth_spell/goal.txt
new file mode 100644
index 000000000..7894abbc4
--- /dev/null
+++ b/missions/contrib/git_basics/06_sixth_spell/goal.txt
@@ -0,0 +1,21 @@
+Mission goal
+============
+
+Finally a last spell to be integrated in order to recover from our efforts: a pint of beer !
+
+Like previously, you are not sure to integrate it directly in the main version of your spellbook, so you will add the spell on a branch called beer CREATED FROM the main branch.
+
+Caution: without amplifier, the spell only creates a small beer, to get a pint you need to copy both the spell file and the amplifier in your spell book (and not the entire directory).
+
+Useful commands
+===============
+
+To create a branch:
+git branch BRANCH_NAME [TREE_ISH]
+TREE_ISH is optional, by default it is HEAD, but one can put here a commit identifier, a branch name, a tag, ..., anything that refers to a commit
+
+To start tracking the file FILENAME or add its modification to the staging area:
+git add FILENAME
+
+To create a commit with a COMMIT_MESSAGE as comment for the commit:
+git commit -m 'COMMIT_MESSAGE'
diff --git a/missions/contrib/git_basics/06_sixth_spell/init.sh b/missions/contrib/git_basics/06_sixth_spell/init.sh
new file mode 100644
index 000000000..b3392ae79
--- /dev/null
+++ b/missions/contrib/git_basics/06_sixth_spell/init.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git branch flame origin/flame_added &> /dev/null
+    git branch cheater origin/cheater_added &> /dev/null
+    git checkout cheater &> /dev/null
+    git branch -f main origin/moving_spell_into_Chapter_1 &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null 
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/06_sixth_spell/static.sh b/missions/contrib/git_basics/06_sixth_spell/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_basics/06_sixth_spell/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/06_sixth_spell/treasure.sh b/missions/contrib/git_basics/06_sixth_spell/treasure.sh
new file mode 100644
index 000000000..690e1cc8f
--- /dev/null
+++ b/missions/contrib/git_basics/06_sixth_spell/treasure.sh
@@ -0,0 +1,94 @@
+#!/usr/bin/env bash
+# beer_bubbles_up.sh — Chope ASCII avec bulles montantes, mousse à gauche et grande anse
+# Quitter avec Ctrl+C
+
+DELAY=0.2
+trap 'tput cnorm; exit' INT
+tput civis
+
+frame=0
+
+# Largeur intérieure (zone bière)
+INNER_WIDTH=19
+INNER_START=2
+INNER_END=13
+
+# Colonnes où les bulles apparaissent
+bubble_cols=(3 6 9 12 15 18)
+
+# Tableau pour la mousse qui coule à gauche
+declare -a left_mousse
+for ((i=INNER_START;i<=INNER_END;i++)); do
+  left_mousse[$i]=" "
+done
+
+while [ $frame -lt 16 ] ; do
+  clear
+
+  # --- Mousse animée sur le dessus ---
+  foam_patterns=(
+"          ~~~~~~~~"
+"         ~~~oOoo~~~"
+"          ~~OoOo~~"
+"         ~ooOoOoo~"
+  )
+  echo "${foam_patterns[$((frame % 4))]}"
+
+  # --- Haut de la chope ---
+  top="         .-----------------.   _______"
+  bottom1="         \\#################/"
+  bottom2="          '---------------'"
+  feet="               |||||"
+
+  echo "$top"
+
+  for ((i=INNER_START; i<=INNER_END; i++)); do
+    # Mousse qui coule sur le côté gauche (descend)
+    if (( frame % 2 == 0 )); then
+      for ((line_idx=INNER_END; line_idx>INNER_START; line_idx--)); do
+        left_mousse[$line_idx]="${left_mousse[$((line_idx-1))]}"
+      done
+      left_mousse[$INNER_START]="|"
+    fi
+
+    # Construire la zone intérieure
+    middle=""
+    for ((j=0; j<INNER_WIDTH; j++)); do
+      middle+="#"
+    done
+
+    # Convertir en tableau
+    middle_chars=()
+    for ((j=0;j<${#middle};j++)); do
+      middle_chars+=("${middle:j:1}")
+    done
+
+    # Bulles qui montent 🫧
+    height=$((INNER_END - INNER_START + 1))
+    for col in "${bubble_cols[@]}"; do
+      pos=$((col-1))
+      # La bulle monte : en haut quand frame augmente
+      bubble_line=$(( (INNER_END - INNER_START) - ((frame + col) % height) ))
+      if (( bubble_line == i - INNER_START )); then
+        middle_chars[$pos]="o"
+      fi
+    done
+
+    # Ajouter la mousse sur le côté gauche
+    middle_chars[0]="${left_mousse[$i]}"
+
+    # Reconstruire la zone bière
+    middle_new=$(printf "%s" "${middle_chars[@]}")
+
+    # Ligne complète avec bords fixes
+    printf "        |%s||         |\n" "$middle_new"
+  done
+
+  # Bas de la chope
+  echo "        |###################|\\_________/"
+  echo "$bottom1"
+  echo "$bottom2"
+  ((frame++))
+  sleep "$DELAY"
+done
+
diff --git a/missions/contrib/git_basics/07a_mergeFF_question/_clean.sh b/missions/contrib/git_basics/07a_mergeFF_question/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/07a_mergeFF_question/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/07a_mergeFF_question/_test.sh b/missions/contrib/git_basics/07a_mergeFF_question/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/07a_mergeFF_question/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/07a_mergeFF_question/_treasure-msg.txt b/missions/contrib/git_basics/07a_mergeFF_question/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/07a_mergeFF_question/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/07a_mergeFF_question/_treasure.sh b/missions/contrib/git_basics/07a_mergeFF_question/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/07a_mergeFF_question/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/07a_mergeFF_question/auto.sh b/missions/contrib/git_basics/07a_mergeFF_question/auto.sh
new file mode 100644
index 000000000..5a8c3e4f1
--- /dev/null
+++ b/missions/contrib/git_basics/07a_mergeFF_question/auto.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+gsh skip
+
diff --git a/missions/contrib/git_basics/07a_mergeFF_question/check.sh b/missions/contrib/git_basics/07a_mergeFF_question/check.sh
new file mode 100644
index 000000000..bd205a7ca
--- /dev/null
+++ b/missions/contrib/git_basics/07a_mergeFF_question/check.sh
@@ -0,0 +1,99 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+check_answer() {
+result=$1
+error_str=$2
+read -r response
+case "$response" in
+  "" | *[!0-9]*)
+    echo "That's not even a number!"
+    return 1
+    ;;
+  *)
+    if [ "$response" -ne $result ]
+    then
+      echo $error_str
+      return 1
+    fi
+    ;;
+esac
+}
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/spellbook
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in your spellbook"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "main" ]
+    then
+        echo "You are not on the main branch..."
+        return 1
+  fi
+
+echo "Does the flame spell exist on the main branch ?"
+echo "1. yes"
+echo "2. no"
+res="2"
+err_str="Too bad! The answer was $res. The flame spell has been added to the flame branch which contains everything of the main branch plus the flame spell."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "Does the flame spell exist on the flame branch ?"
+echo "1. yes"
+echo "2. no"
+res="1"
+err_str="Too bad! The answer was $res. We have added it on the flame branch."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "Does the truth spell exist on the main branch ?"
+echo "1. yes"
+echo "2. no"
+res="1"
+err_str="Too bad! The answer was $res.i The truth spell exists on both main and flame branches."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "Does the truth spell exist on the flame branch ?"
+echo "1. yes"
+echo "2. no"
+res="1"
+err_str="Too bad! The answer was $res.i The truth spell exists on both main and flame branches."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "If we merge the flame branch into the main branch, is it a fast-forward merge or a real merge ?"
+echo "1. fast-forward merge"
+echo "2. real merge"
+res="1"
+err_str="Too bad! The answer was $res. The main branch is a direct ancestor of the flame branch, the history did not fork. So merging flame into main consists simply in moving the main branch where the flame branch is sitting. It is a fast-forward merge."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "After the merge will the flame spell appear on the main branch ?"
+echo "1. yes"
+echo "2. no"
+res="1"
+err_str="Too bad! The answer was $res. After the merge, the history of the main branch will contain the commit that adds the flame spell into the project, so the file will appear."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+}
+_mission_check
diff --git a/missions/contrib/git_basics/07a_mergeFF_question/clean.sh b/missions/contrib/git_basics/07a_mergeFF_question/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/07a_mergeFF_question/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/07a_mergeFF_question/goal.txt b/missions/contrib/git_basics/07a_mergeFF_question/goal.txt
new file mode 100644
index 000000000..ed1803c7a
--- /dev/null
+++ b/missions/contrib/git_basics/07a_mergeFF_question/goal.txt
@@ -0,0 +1,36 @@
+Mission goal
+============
+
+We have now many versions of our spellbook, the main one and several of them containing one new spell each. The idea is to merge all these contributions in the main version, so the main branch.
+
+We will start by the flame branch. Before merging it, let us inspect the repository in order to answer the following questions.
+
+a. Does the flame spell exist on the main branch ?
+b. Does the flame spell exist on the flame branch ?
+c. Does the truth spell exist on the main branch ?
+d. Does the truth spell exist on the flame branch ?
+e. If we merge the flame branch into the main branch, is it a fast-forward merge or a real merge ?
+f. After the merge will the flame spell appear on the main branch ?
+
+
+Ensure you are on the main branch before answering the questions with gsh check.
+
+
+Useful commands
+===============
+
+To look at the history of a local repository putting one commit per line (--oneline), showing diverging and converging history (--graph) and showing all branches (--branches)
+git log --oneline --graph --branches
+
+To display the content of a text file in the terminal
+cat FILE_NAME
+
+To put HEAD on anywhere in the repository and update the working directory:
+git checkout TREE_ISH
+TREE_ISH can be:
+- a branch name
+- a tag
+- any commit referenced by its id, for instance 30c900f
+- any commit being an ancestor of a branch or HEAD, for instance HEAD^ references the immediate ancestor of HEAD, flame^^ references tha ancestor of the ancestor of the commit pointed by flame.
+
+
diff --git a/missions/contrib/git_basics/07a_mergeFF_question/init.sh b/missions/contrib/git_basics/07a_mergeFF_question/init.sh
new file mode 100644
index 000000000..2ee79e23d
--- /dev/null
+++ b/missions/contrib/git_basics/07a_mergeFF_question/init.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git branch flame origin/flame_added &> /dev/null
+    git branch cheater origin/cheater_added &> /dev/null
+    git branch beer origin/beer_added &> /dev/null
+    git checkout beer &> /dev/null
+    git branch -f main origin/moving_spell_into_Chapter_1 &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/07a_mergeFF_question/skip.txt b/missions/contrib/git_basics/07a_mergeFF_question/skip.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/missions/contrib/git_basics/07a_mergeFF_question/static.sh b/missions/contrib/git_basics/07a_mergeFF_question/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_basics/07a_mergeFF_question/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_basics/07b_mergeFF/_clean.sh b/missions/contrib/git_basics/07b_mergeFF/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/07b_mergeFF/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/07b_mergeFF/_test.sh b/missions/contrib/git_basics/07b_mergeFF/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/07b_mergeFF/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/07b_mergeFF/_treasure-msg.txt b/missions/contrib/git_basics/07b_mergeFF/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/07b_mergeFF/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/07b_mergeFF/_treasure.sh b/missions/contrib/git_basics/07b_mergeFF/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/07b_mergeFF/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/07b_mergeFF/auto.sh b/missions/contrib/git_basics/07b_mergeFF/auto.sh
new file mode 100644
index 000000000..f0902e59e
--- /dev/null
+++ b/missions/contrib/git_basics/07b_mergeFF/auto.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+git checkout main
+git merge flame
+gsh check
+
diff --git a/missions/contrib/git_basics/07b_mergeFF/check.sh b/missions/contrib/git_basics/07b_mergeFF/check.sh
new file mode 100644
index 000000000..df6a257ac
--- /dev/null
+++ b/missions/contrib/git_basics/07b_mergeFF/check.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/spellbook
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in your spellbook"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "main" ]
+    then
+        echo "You are not on the main branch..."
+        return 1
+  fi
+
+  log=$(git branch --merged | grep "flame")
+  if [ "$log" = "" ]
+    then
+        echo "flame branch is not merged..."
+        return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_basics/07b_mergeFF/clean.sh b/missions/contrib/git_basics/07b_mergeFF/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/07b_mergeFF/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/07b_mergeFF/goal.txt b/missions/contrib/git_basics/07b_mergeFF/goal.txt
new file mode 100644
index 000000000..935e477d3
--- /dev/null
+++ b/missions/contrib/git_basics/07b_mergeFF/goal.txt
@@ -0,0 +1,19 @@
+Mission goal
+============
+
+Add the flame spell into the main version of your spellbook by realising a merge.
+
+
+Useful commands
+===============
+
+To look at the history of a local repository putting one commit per line (--oneline), showing diverging and converging history (--graph) and all local branches even if they are not part of the history of the commit pointed by HEAD
+git log --oneline --graph --branches
+
+
+To merge a branch. Ensure you are on the branch you want to merge into and then, to merge the branch BRANCH_NAME into it
+git merge BRANCH_NAME
+
+
+
+
diff --git a/missions/contrib/git_basics/07b_mergeFF/init.sh b/missions/contrib/git_basics/07b_mergeFF/init.sh
new file mode 100644
index 000000000..2ee79e23d
--- /dev/null
+++ b/missions/contrib/git_basics/07b_mergeFF/init.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git branch flame origin/flame_added &> /dev/null
+    git branch cheater origin/cheater_added &> /dev/null
+    git branch beer origin/beer_added &> /dev/null
+    git checkout beer &> /dev/null
+    git branch -f main origin/moving_spell_into_Chapter_1 &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/07b_mergeFF/static.sh b/missions/contrib/git_basics/07b_mergeFF/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_basics/07b_mergeFF/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_basics/08a_merge_question/_clean.sh b/missions/contrib/git_basics/08a_merge_question/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/08a_merge_question/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/08a_merge_question/_test.sh b/missions/contrib/git_basics/08a_merge_question/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/08a_merge_question/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/08a_merge_question/_treasure-msg.txt b/missions/contrib/git_basics/08a_merge_question/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/08a_merge_question/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/08a_merge_question/_treasure.sh b/missions/contrib/git_basics/08a_merge_question/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/08a_merge_question/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/08a_merge_question/auto.sh b/missions/contrib/git_basics/08a_merge_question/auto.sh
new file mode 100644
index 000000000..5a8c3e4f1
--- /dev/null
+++ b/missions/contrib/git_basics/08a_merge_question/auto.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+gsh skip
+
diff --git a/missions/contrib/git_basics/08a_merge_question/check.sh b/missions/contrib/git_basics/08a_merge_question/check.sh
new file mode 100644
index 000000000..073f13d8f
--- /dev/null
+++ b/missions/contrib/git_basics/08a_merge_question/check.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+check_answer() {
+result=$1
+error_str=$2
+read -r response
+case "$response" in
+  "" | *[!0-9]*)
+    echo "That's not even a number!"
+    return 1
+    ;;
+  *)
+    if [ "$response" -ne $result ]
+    then
+      echo $error_str
+      return 1
+    fi
+    ;;
+esac
+}
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/spellbook
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in your spellbook"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "main" ]
+    then
+        echo "You are not on the main branch..."
+        return 1
+  fi
+
+echo "a. If we merge the cheater branch into the main branch, is it a fast-forward merge or a real merge ?"
+echo "1. fast-forward merge"
+echo "2. real merge"
+res="2"
+err_str="Too bad! The answer was $res. The main branch is not a direct ancestor of the cheater branch, the history has forked. So merging cheater into main needs really to merge two different versions."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+}
+_mission_check
diff --git a/missions/contrib/git_basics/08a_merge_question/clean.sh b/missions/contrib/git_basics/08a_merge_question/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/08a_merge_question/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/08a_merge_question/goal.txt b/missions/contrib/git_basics/08a_merge_question/goal.txt
new file mode 100644
index 000000000..4b64e501c
--- /dev/null
+++ b/missions/contrib/git_basics/08a_merge_question/goal.txt
@@ -0,0 +1,28 @@
+Mission goal
+============
+
+Now we want to merge the cheater branch. Inspect the repository and answer the following question.
+
+a. If we merge the cheater branch into the main branch, is it a fast-forward merge or a real merge ?
+
+Ensure you are on the main branch before answering the questions with gsh check.
+
+
+Useful commands
+===============
+
+To look at the history of a local repository putting one commit per line (--oneline), showing diverging and converging history (--graph) and showing all branches (--branches)
+git log --oneline --graph --branches
+
+To display the content of a text file in the terminal
+cat FILE_NAME
+
+To put HEAD on anywhere in the repository and update the working directory:
+git checkout TREE_ISH
+TREE_ISH can be:
+- a branch name
+- a tag
+- any commit referenced by its id, for instance 30c900f
+- any commit being an ancestor of a branch or HEAD, for instance HEAD^ references the immediate ancestor of HEAD, flame^^ references tha ancestor of the ancestor of the commit pointed by flame.
+
+
diff --git a/missions/contrib/git_basics/08a_merge_question/init.sh b/missions/contrib/git_basics/08a_merge_question/init.sh
new file mode 100644
index 000000000..00d77f010
--- /dev/null
+++ b/missions/contrib/git_basics/08a_merge_question/init.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git branch flame origin/flame_added &> /dev/null
+    git branch cheater origin/cheater_added &> /dev/null
+    git branch beer origin/beer_added &> /dev/null
+    git reset --hard main origin/flame_merged &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/08a_merge_question/skip.txt b/missions/contrib/git_basics/08a_merge_question/skip.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/missions/contrib/git_basics/08a_merge_question/static.sh b/missions/contrib/git_basics/08a_merge_question/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_basics/08a_merge_question/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_basics/08b_merge/_clean.sh b/missions/contrib/git_basics/08b_merge/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/08b_merge/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/08b_merge/_test.sh b/missions/contrib/git_basics/08b_merge/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/08b_merge/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/08b_merge/_treasure-msg.txt b/missions/contrib/git_basics/08b_merge/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/08b_merge/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/08b_merge/_treasure.sh b/missions/contrib/git_basics/08b_merge/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/08b_merge/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/08b_merge/auto.sh b/missions/contrib/git_basics/08b_merge/auto.sh
new file mode 100644
index 000000000..3a2d1f24b
--- /dev/null
+++ b/missions/contrib/git_basics/08b_merge/auto.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+git checkout main
+git merge cheater --no-edit
+gsh check
+
diff --git a/missions/contrib/git_basics/08b_merge/check.sh b/missions/contrib/git_basics/08b_merge/check.sh
new file mode 100644
index 000000000..467d2ce49
--- /dev/null
+++ b/missions/contrib/git_basics/08b_merge/check.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/spellbook
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in your spellbook"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "main" ]
+    then
+        echo "You are not on the main branch..."
+        return 1
+  fi
+
+  log=$(git branch --merged | grep "cheater")
+  if [ "$log" = "" ]
+    then
+        echo "cheater branch is not merged..."
+        return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_basics/08b_merge/clean.sh b/missions/contrib/git_basics/08b_merge/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/08b_merge/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/08b_merge/goal.txt b/missions/contrib/git_basics/08b_merge/goal.txt
new file mode 100644
index 000000000..5147bafee
--- /dev/null
+++ b/missions/contrib/git_basics/08b_merge/goal.txt
@@ -0,0 +1,19 @@
+Mission goal
+============
+
+Add the cheater spell into the main version of your spellbook by realising a merge.
+
+
+Useful commands
+===============
+
+To look at the history of a local repository putting one commit per line (--oneline), showing diverging and converging history (--graph) and all local branches even if they are not part of the history of the commit pointed by HEAD
+git log --oneline --graph --branches
+
+
+To merge a branch. Ensure you are on the branch you want to merge into and then, to merge the branch BRANCH_NAME into it
+git merge BRANCH_NAME
+
+
+
+
diff --git a/missions/contrib/git_basics/08b_merge/init.sh b/missions/contrib/git_basics/08b_merge/init.sh
new file mode 100644
index 000000000..2adfb4981
--- /dev/null
+++ b/missions/contrib/git_basics/08b_merge/init.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git branch flame origin/flame_added &> /dev/null
+    git branch cheater origin/cheater_added &> /dev/null
+    git branch beer origin/beer_added &> /dev/null
+    git reset --hard origin/flame_merged &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/08b_merge/static.sh b/missions/contrib/git_basics/08b_merge/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_basics/08b_merge/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_basics/09_merge_conflict/_clean.sh b/missions/contrib/git_basics/09_merge_conflict/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/09_merge_conflict/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/09_merge_conflict/_test.sh b/missions/contrib/git_basics/09_merge_conflict/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/09_merge_conflict/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/09_merge_conflict/_treasure-msg.txt b/missions/contrib/git_basics/09_merge_conflict/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/09_merge_conflict/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/09_merge_conflict/_treasure.sh b/missions/contrib/git_basics/09_merge_conflict/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/09_merge_conflict/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/09_merge_conflict/auto.sh b/missions/contrib/git_basics/09_merge_conflict/auto.sh
new file mode 100644
index 000000000..0f7a1c77c
--- /dev/null
+++ b/missions/contrib/git_basics/09_merge_conflict/auto.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+git checkout main
+git merge beer --no-edit
+cp $GSH_TMP/amplifier_conflict_fixed ./amplifier
+git add amplifier
+git commit --no-edit
+gsh check
+
diff --git a/missions/contrib/git_basics/09_merge_conflict/check.sh b/missions/contrib/git_basics/09_merge_conflict/check.sh
new file mode 100644
index 000000000..66f026925
--- /dev/null
+++ b/missions/contrib/git_basics/09_merge_conflict/check.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/spellbook
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in your spellbook"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "main" ]
+    then
+        echo "You are not on the main branch..."
+        return 1
+  fi
+
+  log=$(git branch --merged | grep "beer")
+  if [ "$log" = "" ]
+    then
+        echo "beer branch is not merged..."
+        return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_basics/09_merge_conflict/clean.sh b/missions/contrib/git_basics/09_merge_conflict/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/09_merge_conflict/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/09_merge_conflict/goal.txt b/missions/contrib/git_basics/09_merge_conflict/goal.txt
new file mode 100644
index 000000000..0f6b258f7
--- /dev/null
+++ b/missions/contrib/git_basics/09_merge_conflict/goal.txt
@@ -0,0 +1,44 @@
+Mission goal
+============
+
+Finally add the beer spell into the main version of your spellbook by realising a merge.
+
+You might encounter a conflict on the amplifier. You need some basics on magic to solve this: an amplifier can be used by several spells as long as all the spells are listed in it.
+
+Useful commands
+===============
+
+To look at the history of a local repository putting one commit per line (--oneline), showing diverging and converging history (--graph) and all local branches even if they are not part of the history of the commit pointed by HEAD
+git log --oneline --graph --branches
+
+
+To merge a branch. Ensure you are on the branch you want to merge into and then, to merge the branch BRANCH_NAME into it
+git merge BRANCH_NAME
+
+
+## What is a conflict ?
+A conflict occurs when git is asked to merge two commits where the same line of the same file is modified in both commits.
+In our case, the spell on the power branch has its first line modified and spell on the main branch has also its first line modified.
+
+When a conflict occurs, git modifies the file in the working directoy like this:
+     <<<<<<< HEAD
+     cheater_spell
+     =======
+     beer_spell
+     >>>>>>> power
+
+Between the <<< and the === the version of the branch pointed by HEAD, so in our case the main branch
+Between the === and the >>> the version of beer branch
+Git cannot decide which one is the right one, you have to decide if the first version has be kept, the second, a mix of both, yet a third version... 
+
+## How to fix a conflict ?
+
+-   Replace everything between the <<< and the >>> by the correct version
+-   git add FILE_NAME
+-   git commit
+-   Automatic commit message indicating conflict resolution
+
+
+
+
+
diff --git a/missions/contrib/git_basics/09_merge_conflict/init.sh b/missions/contrib/git_basics/09_merge_conflict/init.sh
new file mode 100644
index 000000000..8bfafbcfb
--- /dev/null
+++ b/missions/contrib/git_basics/09_merge_conflict/init.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git branch flame origin/flame_added &> /dev/null
+    git branch cheater origin/cheater_added &> /dev/null
+    git branch beer origin/beer_added &> /dev/null
+    git reset --hard origin/cheater_merged &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/09_merge_conflict/static.sh b/missions/contrib/git_basics/09_merge_conflict/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_basics/09_merge_conflict/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_basics/10_merge_request/.auto.sh.swo b/missions/contrib/git_basics/10_merge_request/.auto.sh.swo
new file mode 100644
index 000000000..5caf9062f
Binary files /dev/null and b/missions/contrib/git_basics/10_merge_request/.auto.sh.swo differ
diff --git a/missions/contrib/git_basics/10_merge_request/_clean.sh b/missions/contrib/git_basics/10_merge_request/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_basics/10_merge_request/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_basics/10_merge_request/_test.sh b/missions/contrib/git_basics/10_merge_request/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_basics/10_merge_request/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_basics/10_merge_request/_treasure-msg.txt b/missions/contrib/git_basics/10_merge_request/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_basics/10_merge_request/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_basics/10_merge_request/_treasure.sh b/missions/contrib/git_basics/10_merge_request/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_basics/10_merge_request/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_basics/10_merge_request/auto.sh b/missions/contrib/git_basics/10_merge_request/auto.sh
new file mode 100644
index 000000000..edd4bee57
--- /dev/null
+++ b/missions/contrib/git_basics/10_merge_request/auto.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+git checkout main
+git checkout -b new_spell
+echo "100 11" > toilet_cleaner_spell
+git add toilet_cleaner_spell
+git commit -m "toilet_cleaner_spell dded"
+git checkout main
+git merge new_spell
+gsh check
+
diff --git a/missions/contrib/git_basics/10_merge_request/check.sh b/missions/contrib/git_basics/10_merge_request/check.sh
new file mode 100644
index 000000000..87c830959
--- /dev/null
+++ b/missions/contrib/git_basics/10_merge_request/check.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/spellbook
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in your spellbook"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "main" ]
+    then
+        echo "You are not on the main branch..."
+        return 1
+  fi
+
+  log=$(git branch --merged | grep "new_spell")
+  if [ "$log" = "" ]
+    then
+        echo "new_spell branch is not merged..."
+        return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_basics/10_merge_request/clean.sh b/missions/contrib/git_basics/10_merge_request/clean.sh
new file mode 120000
index 000000000..be2f419f7
--- /dev/null
+++ b/missions/contrib/git_basics/10_merge_request/clean.sh
@@ -0,0 +1 @@
+../00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_basics/10_merge_request/goal.txt b/missions/contrib/git_basics/10_merge_request/goal.txt
new file mode 100644
index 000000000..1b72ef79c
--- /dev/null
+++ b/missions/contrib/git_basics/10_merge_request/goal.txt
@@ -0,0 +1,27 @@
+Mission goal
+============
+
+The three spells are now merged into the main version of your spell book ! 
+
+Please note that everything happened locally in your spell book, we were completely disconnected from the remote repository. Let us now perform a merge operation on the remote repository and pull back the result on your local spell book.
+
+1. Push the main branch on the remote repository, if not deon already
+2. Create a new spell  in your local spell book (find a creative name for the file !)
+3. Add it to your spell book on branch called new_spell
+4. Push the new_spell branch on the remote repository
+5. Open a Merge Request on the web interface of the remote repository
+6. Merge it on the web interface
+7. Pull the result back locally
+
+Useful commands
+===============
+
+To push commits from the current branch to the remote repository
+git push
+
+To update your local branch from the remote
+git pull
+
+
+
+
diff --git a/missions/contrib/git_basics/10_merge_request/init.sh b/missions/contrib/git_basics/10_merge_request/init.sh
new file mode 100644
index 000000000..f3ce56447
--- /dev/null
+++ b/missions/contrib/git_basics/10_merge_request/init.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    git branch flame origin/flame_added &> /dev/null
+    git branch cheater origin/cheater_added &> /dev/null
+    git branch beer origin/beer_added &> /dev/null
+    git reset --hard origin/beer_merged &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_basics/10_merge_request/static.sh b/missions/contrib/git_basics/10_merge_request/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_basics/10_merge_request/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_basics/git_basics.idx b/missions/contrib/git_basics/git_basics.idx
new file mode 100644
index 000000000..e549eb15b
--- /dev/null
+++ b/missions/contrib/git_basics/git_basics.idx
@@ -0,0 +1,17 @@
+00_needed_files
+01_create_newrepo
+02_configGitID
+02a_create_newSpell
+02b_add_newSpell
+02c_commit_newSpell
+02d_push_newSpell
+03_second_spell_add_commit_push
+04_third_spell_branch
+05_fifth_spell
+06_sixth_spell
+07a_mergeFF_question
+07b_mergeFF
+08a_merge_question
+08b_merge
+09_merge_conflict
+10_merge_request
diff --git a/missions/contrib/git_beyond/git01/_auto.sh b/missions/contrib/git_beyond/git01/_auto.sh
new file mode 100644
index 000000000..3f24ca772
--- /dev/null
+++ b/missions/contrib/git_beyond/git01/_auto.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
diff --git a/missions/contrib/git_beyond/git01/_clean.sh b/missions/contrib/git_beyond/git01/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_beyond/git01/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_beyond/git01/_test.sh b/missions/contrib/git_beyond/git01/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_beyond/git01/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_beyond/git01/_treasure-msg.txt b/missions/contrib/git_beyond/git01/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_beyond/git01/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_beyond/git01/_treasure.sh b/missions/contrib/git_beyond/git01/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_beyond/git01/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_beyond/git01/check.sh b/missions/contrib/git_beyond/git01/check.sh
new file mode 100644
index 000000000..fb6bae75c
--- /dev/null
+++ b/missions/contrib/git_beyond/git01/check.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  # verifier que le repertoire existe et est un depot git
+
+echo "No proper check implemented yet, so we are assuming you did it right ;)"
+    return 0
+
+    
+}
+_mission_check
diff --git a/missions/contrib/git_beyond/git01/goal.txt b/missions/contrib/git_beyond/git01/goal.txt
new file mode 100644
index 000000000..0c23dfa76
--- /dev/null
+++ b/missions/contrib/git_beyond/git01/goal.txt
@@ -0,0 +1,42 @@
+Mission goal
+============
+
+
+You know git well enough for know.
+
+
+Most of those exercices where done assuming you would be using github.
+
+But there are other providers for git, such as gitlab or PLMLab for french mathematicians.
+
+
+You might want to be ablble to configure multiple git identites, and link them to specific repository on your computer.
+
+The cannot be donne within game shell, but We can provide you with documentation.
+
+We suggest you check the "includeIf" option there:
+
+https://blog.differentpla.net/blog/2023/11/17/multiple-git-identities/
+
+
+Also, you can manage personal hebpages with git.
+
+See here for instance:
+
+https://pages.github.com/
+
+
+
+
+
+There are a few things we didnot mentioned here, like how to revert a commit or manage a fork.
+
+
+the msot complete documentation for git cand be found here:
+
+https://www.atlassian.com/git
+
+
+
+Just type gsh check to finish the game.
+
diff --git a/missions/contrib/git_beyond/git01/init.sh b/missions/contrib/git_beyond/git01/init.sh
new file mode 100644
index 000000000..ca7485185
--- /dev/null
+++ b/missions/contrib/git_beyond/git01/init.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  # ...
+  mkdir -p $GSH_HOME/Castle/Portals/
+  if ! git --version > /dev/null 2 > /dev/null
+    then  echo "git not found"
+    return 1
+  fi
+  
+  
+}
+_mission_init
diff --git a/missions/contrib/git_beyond/git01/static.sh b/missions/contrib/git_beyond/git01/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_beyond/git01/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_beyond/git_beyond.idx b/missions/contrib/git_beyond/git_beyond.idx
new file mode 100644
index 000000000..b7f0f7a5b
--- /dev/null
+++ b/missions/contrib/git_beyond/git_beyond.idx
@@ -0,0 +1,2 @@
+git01
+
diff --git a/missions/contrib/git_branching.idx b/missions/contrib/git_branching.idx
new file mode 100644
index 000000000..725abd36c
--- /dev/null
+++ b/missions/contrib/git_branching.idx
@@ -0,0 +1,17 @@
+git_branching/00_prepare_bare_repo
+git_branching/01_clone
+git_branching/02_local_branch
+git_branching/02a_questions
+git_branching/03_mergeFF
+git_branching/04_contrib
+git_branching/05a_questions
+git_branching/05_merge
+git_branching/06_merge_conflict
+git_branching/07_delete_branch
+git_branching/08_add_remote
+git_branching/09_merge_remote
+git_branching/10_create_fork
+git_branching/11_add_remotes
+git_branching/11a_questions
+git_branching/12_merge_remotes
+git_branching/13_merge_forks
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/PortalBook b/missions/contrib/git_branching/00_prepare_bare_repo/PortalBook
new file mode 100644
index 000000000..48ea307f4
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/PortalBook
@@ -0,0 +1 @@
+Al Jeit: https://git.univ-pau.fr/gameshell_git/al_jeit.git
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/PortalBook_pau b/missions/contrib/git_branching/00_prepare_bare_repo/PortalBook_pau
new file mode 100644
index 000000000..48ea307f4
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/PortalBook_pau
@@ -0,0 +1 @@
+Al Jeit: https://git.univ-pau.fr/gameshell_git/al_jeit.git
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/PortalBook_plm b/missions/contrib/git_branching/00_prepare_bare_repo/PortalBook_plm
new file mode 100644
index 000000000..c03ecb93d
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/PortalBook_plm
@@ -0,0 +1 @@
+Al Jeit: https://plmlab.math.cnrs.fr/gameshell_git/al_jeit.git
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/add_remote_final_exo.sh b/missions/contrib/git_branching/00_prepare_bare_repo/add_remote_final_exo.sh
new file mode 100644
index 000000000..677e38f09
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/add_remote_final_exo.sh
@@ -0,0 +1,31 @@
+
+create_remote() {
+  repo=$1
+  branch1=$2
+  branch2=$3
+  # if file created by `gsh check` of previous exercice is here
+  if [ -f $GSH_TMP/$repo ]
+  then
+    git remote add $repo $GSH_TMP/${repo}_repo
+    git fetch $repo
+    git co $branch1
+    git co $branch2
+    git co spell
+    # This file will be used by the check
+    touch $GSH_TMP/$repo
+  fi
+}
+
+create_remote cair_paravel adding_dark switching_air_earth &> /dev/null
+create_remote hogwarts adding_poison switching_dark_fire &> /dev/null
+create_remote novigrad adding_air switching_water_dark &> /dev/null
+
+# If previous exercice were not done in this session, typically with a `gsh goto`, one is created by default
+nb_repo=$(git remote show | wc -l)
+if [ $nb_repo -lt 3 ]
+then
+  echo "Warning: no history found in repos among cair_paravel, hogwards or novigrad you added in a previous exercice. cair_paravel repo has been set by default."
+  touch $GSH_TMP/cair_paravel
+  create_remote cair_paravel adding_dark switching_air_earth &> /dev/null
+fi
+
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/add_remote_minas_co.sh b/missions/contrib/git_branching/00_prepare_bare_repo/add_remote_minas_co.sh
new file mode 100644
index 000000000..e8b5b8374
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/add_remote_minas_co.sh
@@ -0,0 +1,6 @@
+
+git remote add minas $GSH_TMP/minas_tirith &> /dev/null
+git fetch minas &> /dev/null
+git checkout adding_moisture &> /dev/null
+git checkout switching_magma_earth &> /dev/null
+git checkout spell &> /dev/null
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/add_remote_myfork.sh b/missions/contrib/git_branching/00_prepare_bare_repo/add_remote_myfork.sh
new file mode 100644
index 000000000..bb77b947a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/add_remote_myfork.sh
@@ -0,0 +1,12 @@
+
+# Set again myfork as a remote
+if [ -f $GSH_TMP/fork_url ]
+then
+  fork_url=$(cat $GSH_TMP/fork_url)
+  git remote add myfork $fork_url &> /dev/null
+else
+  echo "Warning: could not retrieve the url of your fork, please add it again"
+  echo "git remote add myfork FORK_URL"
+  # TODO Remove this line when dev is finished
+  git remote add myfork /home/mhaefele/tmp/git/al_jeit
+fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/LICENSE b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/LICENSE
new file mode 100644
index 000000000..f974a41e6
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Matthieu Haefele
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/README.md b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/README.md
new file mode 100644
index 000000000..a55368d87
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/README.md
@@ -0,0 +1,3 @@
+## Amplification spell from Al Jeit city
+
+This repository is used for git training based on [GameShell_git](https://github.com/MKessar/GameShell_git)
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell
new file mode 100644
index 000000000..7608c9694
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell
@@ -0,0 +1,4 @@
+30 77
+30 11
+20 111
+20 66
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell_adding_earth b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell_adding_earth
new file mode 100644
index 000000000..0c05ba79d
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell_adding_earth
@@ -0,0 +1,4 @@
+30 44
+30 11
+10 111
+30 66
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell_adding_light b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell_adding_light
new file mode 100644
index 000000000..7608c9694
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell_adding_light
@@ -0,0 +1,4 @@
+30 77
+30 11
+20 111
+20 66
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell_changing_proportion1 b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell_changing_proportion1
new file mode 100644
index 000000000..ade73b98e
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell_changing_proportion1
@@ -0,0 +1,4 @@
+30 77
+30 11
+10 111
+30 66
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell_changing_proportion2 b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell_changing_proportion2
new file mode 100644
index 000000000..602d35941
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/al_jeit_files/dragon_killer.spell_changing_proportion2
@@ -0,0 +1,4 @@
+30 77
+30 11
+30 111
+10 66
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/README.md b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/README.md
new file mode 100644
index 000000000..467c4e07e
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/README.md
@@ -0,0 +1,3 @@
+## Poison spell from Cair Paravel city
+
+This repository is used for git training based on [GameShell_git](https://github.com/MKessar/GameShell_git)
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell
new file mode 100644
index 000000000..7366d96fd
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell
@@ -0,0 +1,4 @@
+05 11
+05 33
+10 88
+80 99
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell_adding_dark b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell_adding_dark
new file mode 100644
index 000000000..94d66e53e
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell_adding_dark
@@ -0,0 +1,5 @@
+05 11
+05 33
+05 88
+90 99
+05 55
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell_changing_proportion1 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell_changing_proportion1
new file mode 100644
index 000000000..3049eb531
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell_changing_proportion1
@@ -0,0 +1,4 @@
+05 11
+05 33
+15 88
+75 99
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell_changing_proportion2 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell_changing_proportion2
new file mode 100644
index 000000000..8a1debfc5
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell_changing_proportion2
@@ -0,0 +1,4 @@
+05 11
+05 33
+05 88
+95 99
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell_switching_air_earth b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell_switching_air_earth
new file mode 100644
index 000000000..c591ab4e7
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_files/poison.spell_switching_air_earth
@@ -0,0 +1,4 @@
+05 44
+05 33
+15 88
+75 99
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/HEAD b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/HEAD
new file mode 100644
index 000000000..8d78c0dda
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/spell
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/config b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/config
new file mode 100644
index 000000000..07d359d07
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/config
@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/description b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/description
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/applypatch-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/applypatch-msg.sample
new file mode 100755
index 000000000..a5d7b84a6
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/applypatch-msg.sample
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/commit-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/commit-msg.sample
new file mode 100755
index 000000000..b58d1184a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/commit-msg.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/fsmonitor-watchman.sample b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/fsmonitor-watchman.sample
new file mode 100755
index 000000000..14ed0aa42
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/fsmonitor-watchman.sample
@@ -0,0 +1,173 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+	die "Unsupported query-fsmonitor hook version '$version'.\n" .
+	    "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
+
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
+
+	# In the query expression below we're asking for names of files that
+	# changed since $last_update_token but not from the .git folder.
+	#
+	# To accomplish this, we're using the "since" generator to use the
+	# recency index to select candidate nodes and "fields" to limit the
+	# output to file names only. Then we're using the "expression" term to
+	# further constrain the results.
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+	}
+	my $query = <<"	END";
+		["query", "$git_work_tree", {
+			"since": $last_update_token,
+			"fields": ["name"],
+			"expression": ["not", ["dirname", ".git"]]
+		}]
+	END
+
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
+	print CHLD_IN $query;
+	close CHLD_IN;
+	my $response = do {local $/; <CHLD_OUT>};
+
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
+	die "Watchman: command returned no output.\n" .
+	"Falling back to scanning...\n" if $response eq "";
+	die "Watchman: command returned invalid output: $response\n" .
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
+		$retry--;
+		my $response = qx/watchman watch "$git_work_tree"/;
+		die "Failed to make watchman watch '$git_work_tree'.\n" .
+		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
+
+		# Watchman will always return all files on the first query so
+		# return the fast "everything is dirty" flag to git and do the
+		# Watchman query just to get it over with now so we won't pay
+		# the cost in git to look up each individual file.
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
+		eval { launch_watchman() };
+		return 0;
+	}
+
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;
+
+	return 1;
+}
+
+sub get_working_dir {
+	my $working_dir;
+	if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+		$working_dir = Win32::GetCwd();
+		$working_dir =~ tr/\\/\//;
+	} else {
+		require Cwd;
+		$working_dir = Cwd::cwd();
+	}
+
+	return $working_dir;
+}
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/post-update.sample b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/post-update.sample
new file mode 100755
index 000000000..ec17ec193
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/post-update.sample
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-applypatch.sample b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-applypatch.sample
new file mode 100755
index 000000000..4142082bc
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-applypatch.sample
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-commit.sample b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-commit.sample
new file mode 100755
index 000000000..e144712c8
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-commit.sample
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=$(git hash-object -t tree /dev/null)
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --type=bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-merge-commit.sample b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-merge-commit.sample
new file mode 100755
index 000000000..399eab192
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-merge-commit.sample
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+        exec "$GIT_DIR/hooks/pre-commit"
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-push.sample b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-push.sample
new file mode 100755
index 000000000..4ce688d32
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-push.sample
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+	if test "$local_oid" = "$zero"
+	then
+		# Handle delete
+		:
+	else
+		if test "$remote_oid" = "$zero"
+		then
+			# New branch, examine all commits
+			range="$local_oid"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_oid..$local_oid"
+		fi
+
+		# Check for WIP commit
+		commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+		if test -n "$commit"
+		then
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-rebase.sample b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-rebase.sample
new file mode 100755
index 000000000..6cbef5c37
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-rebase.sample
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up to date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".
+
+DOC_END
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-receive.sample b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-receive.sample
new file mode 100755
index 000000000..a1fd29ec1
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/pre-receive.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to make use of push options.
+# The example simply echoes all push options that start with 'echoback='
+# and rejects all pushes when the "reject" push option is used.
+#
+# To enable this hook, rename this file to "pre-receive".
+
+if test -n "$GIT_PUSH_OPTION_COUNT"
+then
+	i=0
+	while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
+	do
+		eval "value=\$GIT_PUSH_OPTION_$i"
+		case "$value" in
+		echoback=*)
+			echo "echo from the pre-receive-hook: ${value#*=}" >&2
+			;;
+		reject)
+			exit 1
+		esac
+		i=$((i + 1))
+	done
+fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/prepare-commit-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/prepare-commit-msg.sample
new file mode 100755
index 000000000..10fa14c5a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/prepare-commit-msg.sample
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
+
+# case "$COMMIT_SOURCE,$SHA1" in
+#  ,|template,)
+#    /usr/bin/perl -i.bak -pe '
+#       print "\n" . `git diff --cached --name-status -r`
+# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+#  *) ;;
+# esac
+
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/push-to-checkout.sample b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/push-to-checkout.sample
new file mode 100755
index 000000000..af5a0c001
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/push-to-checkout.sample
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+	echo >&2 "$*"
+	exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+	die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+	die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+#   head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+	head=HEAD
+else
+	head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+	die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+	die "Could not update working tree to new HEAD"
+fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/update.sample b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/update.sample
new file mode 100755
index 000000000..c4d426bc6
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/hooks/update.sample
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to block unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/info/exclude b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/info/exclude
new file mode 100644
index 000000000..a5196d1be
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/1c/5d7b11c49595de76d143ccb13ada0eb1662e6e b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/1c/5d7b11c49595de76d143ccb13ada0eb1662e6e
new file mode 100644
index 000000000..f86696b0f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/1c/5d7b11c49595de76d143ccb13ada0eb1662e6e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/23/62c6314139d21f1ea6c546c729a75d984dd676 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/23/62c6314139d21f1ea6c546c729a75d984dd676
new file mode 100644
index 000000000..feec6806a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/23/62c6314139d21f1ea6c546c729a75d984dd676
@@ -0,0 +1 @@
+x
m�Kj�0��)z0���
�0��!Z�V�`�C[C����Ԣx�o[�0Z�ԅRʑ	Y�9jg���C�c�]�.9�)���p�@��.�1XĀ6M��v4�Ф����mD��^v�WL����7nTdo�V>J�8�nW0��e9#��������ް�R�
/șW���g��kn�����Q�g�Tj{��ҋ�'�P�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e
new file mode 100644
index 000000000..67e064db6
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/30/49eb531d0199de8f12c25e94804c23fc6009b0 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/30/49eb531d0199de8f12c25e94804c23fc6009b0
new file mode 100644
index 000000000..bd775fd2d
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/30/49eb531d0199de8f12c25e94804c23fc6009b0 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/46/7c4e07e9a70884d68aececf4c8d24412c466d7 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/46/7c4e07e9a70884d68aececf4c8d24412c466d7
new file mode 100644
index 000000000..a6d3f9ec0
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/46/7c4e07e9a70884d68aececf4c8d24412c466d7
@@ -0,0 +1,4 @@
+x
U��
+�@���h�!X����
�Dd/^r�lؽ�{��r�a|�����k4�&#l
+)�Sp"V4��		-祪�
&1΢
+���D�sFV���~��g�-���u�y��s�췭�z	f���T_�H7:
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/5b/67b2b42374ece1e894b9dc8d7484bd96e64ae7 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/5b/67b2b42374ece1e894b9dc8d7484bd96e64ae7
new file mode 100644
index 000000000..ef395a136
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/5b/67b2b42374ece1e894b9dc8d7484bd96e64ae7
@@ -0,0 +1 @@
+x
mοj�0���z��F'�O!d,�N}�p֝j[.�2��6����/m�Z:o�z
�%	��?8�l#���)[‘=��W�Ԥv��8L��FK��vLi‘��L�/�n}����
�|m����B;�w�<�����Ւ�+�Zh�eYO��a�֠�gm�V�w�K�7�}.r��,��q��a~�9ն���Q��3�Ԯ��CV-
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc
new file mode 100644
index 000000000..c3d0c4879
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e
new file mode 100644
index 000000000..b5286ff53
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/73/66d96fd5b217141a5504be580fa7965243cd35 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/73/66d96fd5b217141a5504be580fa7965243cd35
new file mode 100644
index 000000000..c9fbe0ee5
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/73/66d96fd5b217141a5504be580fa7965243cd35 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97
new file mode 100644
index 000000000..e22ee2b07
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83
new file mode 100644
index 000000000..6ebd6dd24
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83
@@ -0,0 +1,3 @@
+x
m�=N�0@aj�b:
+����%����������Ďf� nO�PҾ��Km�J��Cg"��U�6�i�Z��������qI��T;x3e7��C�r
+c�3�f9��^yeI�/�����GY���V�y��ӵq"&�Cl��jt*����'������P����
��Z�0�ʰ��S�|f��i�z.�;��q/���LR�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/82/3b038ccd753fc2ccf88a38a8b3806ad38200d4 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/82/3b038ccd753fc2ccf88a38a8b3806ad38200d4
new file mode 100644
index 000000000..e02194cd3
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/82/3b038ccd753fc2ccf88a38a8b3806ad38200d4
@@ -0,0 +1 @@
+x
m�Aj�0��u���f"�6��e�!F�V�� +�o�t�Ճo��d[�܁�}�MD�K����ى�J�A��֦Ĉ�(�͍��#�B�'�(8Nt��'�(��C5��`�ޗ���c����;gY�V��+��yH�����yv�5�<ٵ��{_���5iQ8�2,/9Km���?�Us�\`�i)��	Mj
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/8a/1debfc58cd61aaf8e8bc4711ca812db7d81b97 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/8a/1debfc58cd61aaf8e8bc4711ca812db7d81b97
new file mode 100644
index 000000000..3a20f29b0
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/8a/1debfc58cd61aaf8e8bc4711ca812db7d81b97 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/8f/3e0ab4867b4c65f68f15da4f63d7cbe5d73cc4 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/8f/3e0ab4867b4c65f68f15da4f63d7cbe5d73cc4
new file mode 100644
index 000000000..1ecc7252f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/8f/3e0ab4867b4c65f68f15da4f63d7cbe5d73cc4 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/94/d66e53e4000ae6a219c6a4b140a5581b7a2db4 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/94/d66e53e4000ae6a219c6a4b140a5581b7a2db4
new file mode 100644
index 000000000..d152f6c2f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/94/d66e53e4000ae6a219c6a4b140a5581b7a2db4 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/9d/8a3166cac769a309d07c7058597877cfecb981 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/9d/8a3166cac769a309d07c7058597877cfecb981
new file mode 100644
index 000000000..96184e240
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/9d/8a3166cac769a309d07c7058597877cfecb981
@@ -0,0 +1 @@
+x
+)JMU04�d040031Q��tv�ve�Y�D.Ǽzּ�-�׻�}J|�9�$�����U/7���Ə��r��k]o�|9q�E�H�u����������̜��"��Ԝ�]�)�i��ޚU�����U�;�TyA~fq~T]���?gW�x��]�T�����
h�E�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a
new file mode 100644
index 000000000..2ad06ec33
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b
new file mode 100644
index 000000000..b8debac99
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/c0/857578b74aa7a4d3346421f1c3039c5adbf4ba b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/c0/857578b74aa7a4d3346421f1c3039c5adbf4ba
new file mode 100644
index 000000000..85ec0695b
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/c0/857578b74aa7a4d3346421f1c3039c5adbf4ba differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/c5/91ab4e7b7f420164716c6353c5eedb2137bc6d b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/c5/91ab4e7b7f420164716c6353c5eedb2137bc6d
new file mode 100644
index 000000000..929717d40
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/c5/91ab4e7b7f420164716c6353c5eedb2137bc6d differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/cc/44f9cc0eb5a4c45e2156bcb9a00ffa11ca1c15 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/cc/44f9cc0eb5a4c45e2156bcb9a00ffa11ca1c15
new file mode 100644
index 000000000..51d05279a
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/cc/44f9cc0eb5a4c45e2156bcb9a00ffa11ca1c15 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/d3/04ae71f8b685a1f49d6f0757cf4a13d6113946 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/d3/04ae71f8b685a1f49d6f0757cf4a13d6113946
new file mode 100644
index 000000000..eb4c93048
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/d3/04ae71f8b685a1f49d6f0757cf4a13d6113946 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6
new file mode 100644
index 000000000..276616a2c
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6
@@ -0,0 +1 @@
+x
mͽ�0@ag��n&�?R 17\|��\��Ps)��]����E\n"!2�/+S����)%v�!�І+�Tnj�0�K��������NO���qm��"!�܄0���U�
;&�����c�p���=&�W��[;ќw��.��N{hI��p�'s~�����F�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/dd/fbecae058b05458bef67f05abf85765d506cfc b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/dd/fbecae058b05458bef67f05abf85765d506cfc
new file mode 100644
index 000000000..31a243dfd
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/dd/fbecae058b05458bef67f05abf85765d506cfc differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e
new file mode 100644
index 000000000..5742c0fa8
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae
new file mode 100644
index 000000000..2abbac391
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355 b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355
new file mode 100644
index 000000000..2ffcdf19f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/refs/heads/adding_dark b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/refs/heads/adding_dark
new file mode 100644
index 000000000..1ff08baf0
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/refs/heads/adding_dark
@@ -0,0 +1 @@
+5b67b2b42374ece1e894b9dc8d7484bd96e64ae7
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/refs/heads/spell b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/refs/heads/spell
new file mode 100644
index 000000000..8bb9d53cd
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/refs/heads/spell
@@ -0,0 +1 @@
+1c5d7b11c49595de76d143ccb13ada0eb1662e6e
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/refs/heads/switching_air_earth b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/refs/heads/switching_air_earth
new file mode 100644
index 000000000..6e6583493
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/cair_paravel_repo/refs/heads/switching_air_earth
@@ -0,0 +1 @@
+2362c6314139d21f1ea6c546c729a75d984dd676
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/clean.sh b/missions/contrib/git_branching/00_prepare_bare_repo/clean.sh
new file mode 100644
index 000000000..3fe8281cf
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/clean.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
+
+# back to HOM in order to avoid getcwd error
+
+if [ $GSH_LAST_ACTION = check_false ] 
+then
+  echo "Environment kept. If you want to start again from a clean one:"
+  echo "gsh reset"
+  echo ""
+
+  touch $GSH_TMP/skip_init
+else
+  cd $GSH_HOME
+  rm -rf $GSH_HOME/Castle/Portals/al_jeit
+  rm -rf $GSH_TMP/al_jeit
+fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/clone.sh b/missions/contrib/git_branching/00_prepare_bare_repo/clone.sh
new file mode 100644
index 000000000..c880bcb45
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/clone.sh
@@ -0,0 +1,24 @@
+
+cd $GSH_HOME/Castle/Portals
+cp -r $GSH_TMP/solution1_repo $GSH_TMP/al_jeit
+git clone $GSH_TMP/al_jeit
+cd al_jeit
+if [ -f $GSH_TMP/gitconfig ]
+then
+  git config --local user.name $(cat $GSH_TMP/gitconfig | grep name | cut -d '=' -f2)
+  git config --local user.email $(cat $GSH_TMP/gitconfig | grep email | cut -d '=' -f2)
+else
+  git config --local user.name Jaffar
+  git config --local user.email jaffar@aladin.cool
+fi
+git config --local core.editor nano
+git config --local alias.co checkout
+git config --local alias.br branch
+git config --local alias.ci commit
+git config --local alias.st status
+git config --local alias.last "log -1 HEAD"
+git config --local alias.lo "log --oneline --graph --branches"
+
+
+git reset --hard origin/spell_init
+git push origin spell --force
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/co.sh b/missions/contrib/git_branching/00_prepare_bare_repo/co.sh
new file mode 100644
index 000000000..806204f8c
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/co.sh
@@ -0,0 +1,2 @@
+git branch adding_light origin/adding_light
+git branch adding_earth origin/adding_earth
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/gen_repo.sh b/missions/contrib/git_branching/00_prepare_bare_repo/gen_repo.sh
new file mode 100644
index 000000000..3bbba4312
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/gen_repo.sh
@@ -0,0 +1,107 @@
+gen_repo_spec() {
+
+sorcerer1=$1
+sorcerer2=$2
+repo=$3
+spell=$4
+version1=$5
+version2=$6
+
+echo version2 : $version2
+
+git clone al_jeit_repo ./${repo}
+cd ${repo}
+git checkout spell
+
+cp ../${repo}_files/${spell} ../${repo}_files/README.md .
+git add *
+git commit -m "Initial spell" --author="$sorcerer1"
+
+version="changing_proportion"
+cp ../${repo}_files/${spell}_${version}1 ./${spell}
+git commit -am "$(echo $version | sed -e "s/_/ /g")" --author="$sorcerer1"
+
+version=$version1
+git checkout -b $version
+cp ../${repo}_files/${spell}_${version} ./${spell}
+git commit -am "$(echo $version | sed -e "s/_/ /g")" --author="$sorcerer1"
+
+version="changing_proportion"
+git checkout spell 
+cp ../${repo}_files/${spell}_${version}2 ./${spell}
+git commit -am "$(echo $version | sed -e "s/_/ /g")" --author="$sorcerer1"
+
+version=$version2
+git checkout -b $version
+cp ../${repo}_files/${spell}_${version} ./${spell}
+git commit -am "$(echo $version | sed -e "s/_/ /g")" --author="$sorcerer2"
+
+mkdir ../${repo}_repo
+cd ../${repo}_repo
+git init --bare
+echo "ref: refs/heads/spell" > HEAD
+
+cd $OLDPWD
+git remote add ${repo} ../${repo}_repo
+git push ${repo} spell $version1 $version2
+
+cd ..
+}
+
+
+sorcerer1="Merwyn Ril' Avalon <merwyn@sorcerer2.book>"
+sorcerer2="Ewilan Gil' Sayan <ewilan@ewilan.book>"
+repo=al_jeit
+spell=dragon_killer.spell
+mkdir ${repo}
+cd ${repo}
+git init --initial-branch=spell
+cp ../${repo}_files/README.md  ../${repo}_files/LICENSE ../${repo}_files/${spell} .
+git add *
+git commit -m "Initial dragon killer spell" --author="$sorcerer1"
+
+version="changing_proportion"
+cp ../${repo}_files/${spell}_${version}1 ./${spell}
+git commit -am "$(echo $version | sed -e "s/_/ /g")" --author="$sorcerer1"
+
+version="adding_earth"
+git checkout -b $version
+cp ../${repo}_files/${spell}_${version} ./${spell}
+git commit -am "$(echo $version | sed -e "s/_/ /g")" --author="$sorcerer1"
+
+version="changing_proportion"
+git checkout spell 
+cp ../${repo}_files/${spell}_${version}2 ./${spell}
+git commit -am "$(echo $version | sed -e "s/_/ /g")" --author="$sorcerer1"
+
+version="adding_light"
+git checkout -b $version
+cp ../${repo}_files/${spell}_${version} ./${spell}
+git commit -am "$(echo $version | sed -e "s/_/ /g")" --author="$sorcerer2"
+
+mkdir ../${repo}_repo
+cd ../${repo}_repo
+git init --bare
+echo "ref: refs/heads/spell" > HEAD
+
+cd $OLDPWD
+git remote add ${repo} ../${repo}_repo
+git push ${repo} spell adding_earth adding_light
+
+cd ..
+
+# Lord of the Rings repo
+gen_repo_spec "Gandalf <gandalf@lordsoftherings.book>" "Saroumane <saroumane@lordsoftherings.book>" \
+minas_tirith amplification.spell switching_magma_earth adding_moisture
+
+# Harry Potter repo
+gen_repo_spec "Albus Dumbledore <albus@harrypotter.book>" "Lord Voldemort <voledmort@harrypotter.book>" \
+hogwarts weaken.spell switching_dark_fire adding_poison
+
+# Narnia repo
+gen_repo_spec "Jadis <jadis@chroniclesnarnia.film>" "King beyond the Seas <king_beyond_seas@chroniclesnarnia.film>" \
+cair_paravel poison.spell switching_air_earth adding_dark
+
+# The Witcher repo
+gen_repo_spec "Yennefer de Vengerberg <yennefer@thewitcher.book>" "Ciri <ciri@thewitcher.book>" \
+novigrad no_regen.spell switching_water_dark adding_air
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/gen_solution_repo.sh b/missions/contrib/git_branching/00_prepare_bare_repo/gen_solution_repo.sh
new file mode 100755
index 000000000..a36f52c87
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/gen_solution_repo.sh
@@ -0,0 +1,49 @@
+export GSH_TMP=$(realpath .)
+export GSH_HOME=$(realpath .)
+git clone $GSH_TMP/al_jeit_repo ./solution1
+cd solution1
+. $GSH_TMP/co.sh
+
+git branch spell_init
+# 03_mergeFF
+git merge adding_light 
+
+# 04_contrib
+git checkout -b power
+cp $GSH_TMP/../04_contrib/dragon_killer.spell .
+git commit -am "magma switched to fire !"
+git branch power_marker
+
+# 05_merge
+git checkout spell
+git merge adding_earth --no-edit
+git branch adding_earth_merged
+
+git branch -m power power_marker
+
+# 06_merge_conflict
+git merge power
+cp $GSH_TMP/../06_merge_conflict/dragon_killer.spell .
+git add dragon_killer.spell
+git commit -m "conflict solved, fire kept"
+git branch conflict_solved
+
+# 09_merge_remote
+. $GSH_TMP/add_remote_minas_co.sh
+git checkout -b ampli minas/spell
+git merge switching_magma_earth --no-edit
+git merge adding_moisture --no-edit
+git checkout spell
+git merge ampli --no-edit
+git branch merge_remote
+
+repo=solution1_repo
+mkdir -p $GSH_TMP/$repo
+cd $GSH_TMP/$repo
+git init --bare
+echo "ref: refs/heads/spell" > HEAD
+cd $OLDPWD
+git remote add $repo $GSH_TMP/$repo
+git push $repo spell spell_init adding_earth adding_light power_marker adding_earth_merged conflict_solved merge_remote
+
+
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/README.md b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/README.md
new file mode 100644
index 000000000..77cda0c05
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/README.md
@@ -0,0 +1,3 @@
+## Weaken spell from Hogwarts
+
+This repository is used for git training based on [GameShell_git](https://github.com/MKessar/GameShell_git)
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell
new file mode 100644
index 000000000..3224af83f
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell
@@ -0,0 +1,4 @@
+30 55
+30 222
+20 33
+20 11
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell_adding_poison b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell_adding_poison
new file mode 100644
index 000000000..c07627556
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell_adding_poison
@@ -0,0 +1,5 @@
+30 55
+30 222
+05 33
+25 11
+10 99
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell_changing_proportion1 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell_changing_proportion1
new file mode 100644
index 000000000..b3fb48e10
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell_changing_proportion1
@@ -0,0 +1,4 @@
+30 55
+30 222
+10 33
+30 11
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell_changing_proportion2 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell_changing_proportion2
new file mode 100644
index 000000000..ae07a50df
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell_changing_proportion2
@@ -0,0 +1,4 @@
+30 55
+30 222
+05 33
+35 11
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell_switching_dark_fire b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell_switching_dark_fire
new file mode 100644
index 000000000..5b2bd9b45
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_files/weaken.spell_switching_dark_fire
@@ -0,0 +1,4 @@
+30 22
+30 222
+10 33
+30 11
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/HEAD b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/HEAD
new file mode 100644
index 000000000..8d78c0dda
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/spell
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/config b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/config
new file mode 100644
index 000000000..07d359d07
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/config
@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/description b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/description
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/applypatch-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/applypatch-msg.sample
new file mode 100755
index 000000000..a5d7b84a6
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/applypatch-msg.sample
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/commit-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/commit-msg.sample
new file mode 100755
index 000000000..b58d1184a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/commit-msg.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/fsmonitor-watchman.sample b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/fsmonitor-watchman.sample
new file mode 100755
index 000000000..14ed0aa42
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/fsmonitor-watchman.sample
@@ -0,0 +1,173 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+	die "Unsupported query-fsmonitor hook version '$version'.\n" .
+	    "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
+
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
+
+	# In the query expression below we're asking for names of files that
+	# changed since $last_update_token but not from the .git folder.
+	#
+	# To accomplish this, we're using the "since" generator to use the
+	# recency index to select candidate nodes and "fields" to limit the
+	# output to file names only. Then we're using the "expression" term to
+	# further constrain the results.
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+	}
+	my $query = <<"	END";
+		["query", "$git_work_tree", {
+			"since": $last_update_token,
+			"fields": ["name"],
+			"expression": ["not", ["dirname", ".git"]]
+		}]
+	END
+
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
+	print CHLD_IN $query;
+	close CHLD_IN;
+	my $response = do {local $/; <CHLD_OUT>};
+
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
+	die "Watchman: command returned no output.\n" .
+	"Falling back to scanning...\n" if $response eq "";
+	die "Watchman: command returned invalid output: $response\n" .
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
+		$retry--;
+		my $response = qx/watchman watch "$git_work_tree"/;
+		die "Failed to make watchman watch '$git_work_tree'.\n" .
+		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
+
+		# Watchman will always return all files on the first query so
+		# return the fast "everything is dirty" flag to git and do the
+		# Watchman query just to get it over with now so we won't pay
+		# the cost in git to look up each individual file.
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
+		eval { launch_watchman() };
+		return 0;
+	}
+
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;
+
+	return 1;
+}
+
+sub get_working_dir {
+	my $working_dir;
+	if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+		$working_dir = Win32::GetCwd();
+		$working_dir =~ tr/\\/\//;
+	} else {
+		require Cwd;
+		$working_dir = Cwd::cwd();
+	}
+
+	return $working_dir;
+}
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/post-update.sample b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/post-update.sample
new file mode 100755
index 000000000..ec17ec193
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/post-update.sample
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-applypatch.sample b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-applypatch.sample
new file mode 100755
index 000000000..4142082bc
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-applypatch.sample
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-commit.sample b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-commit.sample
new file mode 100755
index 000000000..e144712c8
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-commit.sample
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=$(git hash-object -t tree /dev/null)
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --type=bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-merge-commit.sample b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-merge-commit.sample
new file mode 100755
index 000000000..399eab192
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-merge-commit.sample
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+        exec "$GIT_DIR/hooks/pre-commit"
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-push.sample b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-push.sample
new file mode 100755
index 000000000..4ce688d32
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-push.sample
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+	if test "$local_oid" = "$zero"
+	then
+		# Handle delete
+		:
+	else
+		if test "$remote_oid" = "$zero"
+		then
+			# New branch, examine all commits
+			range="$local_oid"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_oid..$local_oid"
+		fi
+
+		# Check for WIP commit
+		commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+		if test -n "$commit"
+		then
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-rebase.sample b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-rebase.sample
new file mode 100755
index 000000000..6cbef5c37
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-rebase.sample
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up to date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".
+
+DOC_END
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-receive.sample b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-receive.sample
new file mode 100755
index 000000000..a1fd29ec1
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/pre-receive.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to make use of push options.
+# The example simply echoes all push options that start with 'echoback='
+# and rejects all pushes when the "reject" push option is used.
+#
+# To enable this hook, rename this file to "pre-receive".
+
+if test -n "$GIT_PUSH_OPTION_COUNT"
+then
+	i=0
+	while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
+	do
+		eval "value=\$GIT_PUSH_OPTION_$i"
+		case "$value" in
+		echoback=*)
+			echo "echo from the pre-receive-hook: ${value#*=}" >&2
+			;;
+		reject)
+			exit 1
+		esac
+		i=$((i + 1))
+	done
+fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/prepare-commit-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/prepare-commit-msg.sample
new file mode 100755
index 000000000..10fa14c5a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/prepare-commit-msg.sample
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
+
+# case "$COMMIT_SOURCE,$SHA1" in
+#  ,|template,)
+#    /usr/bin/perl -i.bak -pe '
+#       print "\n" . `git diff --cached --name-status -r`
+# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+#  *) ;;
+# esac
+
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/push-to-checkout.sample b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/push-to-checkout.sample
new file mode 100755
index 000000000..af5a0c001
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/push-to-checkout.sample
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+	echo >&2 "$*"
+	exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+	die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+	die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+#   head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+	head=HEAD
+else
+	head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+	die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+	die "Could not update working tree to new HEAD"
+fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/update.sample b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/update.sample
new file mode 100755
index 000000000..c4d426bc6
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/hooks/update.sample
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to block unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/info/exclude b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/info/exclude
new file mode 100644
index 000000000..a5196d1be
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/02/bcacd31c152d57f766d234a9755b7dc02be849 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/02/bcacd31c152d57f766d234a9755b7dc02be849
new file mode 100644
index 000000000..1d81dea55
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/02/bcacd31c152d57f766d234a9755b7dc02be849 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/09/c4fd95da447df994aa88c01ea5bfa725a55695 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/09/c4fd95da447df994aa88c01ea5bfa725a55695
new file mode 100644
index 000000000..b02dea541
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/09/c4fd95da447df994aa88c01ea5bfa725a55695 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e
new file mode 100644
index 000000000..67e064db6
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/32/24af83fc0fc628a101502a29c010702fab7cb0 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/32/24af83fc0fc628a101502a29c010702fab7cb0
new file mode 100644
index 000000000..f9f8e5da3
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/32/24af83fc0fc628a101502a29c010702fab7cb0 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/47/10937893ed07f9c6b4d4bad1800238651bad2f b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/47/10937893ed07f9c6b4d4bad1800238651bad2f
new file mode 100644
index 000000000..2658ed39a
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/47/10937893ed07f9c6b4d4bad1800238651bad2f differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/4e/e7e92b189817881f03b8dc60221020fe1327c4 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/4e/e7e92b189817881f03b8dc60221020fe1327c4
new file mode 100644
index 000000000..cde22b480
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/4e/e7e92b189817881f03b8dc60221020fe1327c4
@@ -0,0 +1 @@
+x
m��j�0����Y�X��B��!FҨ6��0�)}���e������
4�&̠B�%�d��%K�}R�BN#!�
�;	o
�Σ��0�0b�я��
�l���u踣�MU�e���c��*g���D"���Kk�=�����A�Ii���s�1�7jm���W���#��I?��%m��E��t����4o�InPf���)R
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/5b/2bd9b45d4576d32da4ad08fa84898873fefadd b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/5b/2bd9b45d4576d32da4ad08fa84898873fefadd
new file mode 100644
index 000000000..8ae169854
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/5b/2bd9b45d4576d32da4ad08fa84898873fefadd differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc
new file mode 100644
index 000000000..c3d0c4879
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e
new file mode 100644
index 000000000..b5286ff53
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/69/463ca0b052bdc2f1ccb90585b97a0d60100428 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/69/463ca0b052bdc2f1ccb90585b97a0d60100428
new file mode 100644
index 000000000..2f7b2e481
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/69/463ca0b052bdc2f1ccb90585b97a0d60100428 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/72/d688ba5d3965f8b86ff1a23a3d388df594757e b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/72/d688ba5d3965f8b86ff1a23a3d388df594757e
new file mode 100644
index 000000000..6ea28304b
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/72/d688ba5d3965f8b86ff1a23a3d388df594757e
@@ -0,0 +1 @@
+x
mλj�0���z���.�eC�"MB#ͬMl���E�>ΥL�q�9�n���z�Ԅht8�����&��lL�F���d�5��(T&���̆t�Ʋ����q��0�Ϩ�G�����ndž+�*��[�s��kk$���&xg�����Z��s��{lm^耷HL�����嚊<:�2*ͱܗr�]�^�-��/�iR�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/74/8437a3306b03a453584dbc529c67b0de823b78 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/74/8437a3306b03a453584dbc529c67b0de823b78
new file mode 100644
index 000000000..e5b5eadea
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/74/8437a3306b03a453584dbc529c67b0de823b78
@@ -0,0 +1 @@
+x
mλj�0���z��f$YCH�&1��Ll���E�>�K����sb��u�2�ap�`���HШ��*2ư��&,�0Y����� �m�S�z�$�XS|�IJ�N��T�2;㲠s��������:gx�o�Tb�<������3Hg�D���GT�"�\���ƨk>�r��=���T�ߦ��dD�Ԯk�����<���BQ�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97
new file mode 100644
index 000000000..e22ee2b07
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/77/cda0c05ba989b4b87297901ea5c1db1c314456 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/77/cda0c05ba989b4b87297901ea5c1db1c314456
new file mode 100644
index 000000000..83ba0ad8e
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/77/cda0c05ba989b4b87297901ea5c1db1c314456 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83
new file mode 100644
index 000000000..6ebd6dd24
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83
@@ -0,0 +1,3 @@
+x
m�=N�0@aj�b:
+����%����������Ďf� nO�PҾ��Km�J��Cg"��U�6�i�Z��������qI��T;x3e7��C�r
+c�3�f9��^yeI�/�����GY���V�y��ӵq"&�Cl��jt*����'������P����
��Z�0�ʰ��S�|f��i�z.�;��q/���LR�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/7f/e2ca3bdf1e0cd12f02455e3bbb92f3bc04fe83 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/7f/e2ca3bdf1e0cd12f02455e3bbb92f3bc04fe83
new file mode 100644
index 000000000..41400b052
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/7f/e2ca3bdf1e0cd12f02455e3bbb92f3bc04fe83
@@ -0,0 +1 @@
+x
mνj�0��z��f��,B�@��������-#�E�>�ݕ)�c&�e���_Zem%ʺAqB;�:���t��\o�h���6�������)J�Gg�Dd�֜�!9%�ѦR�#�c��c	�S�o�O.���g+�q�B)�w��(��I�W$D�W�\}k��|y9�#�S��!��ֽ�?3�{���3��,~
�3N�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a
new file mode 100644
index 000000000..2ad06ec33
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b
new file mode 100644
index 000000000..b8debac99
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/ae/07a50dfd152203a41c1d315fc94b53f3c0c110 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/ae/07a50dfd152203a41c1d315fc94b53f3c0c110
new file mode 100644
index 000000000..532e1fb24
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/ae/07a50dfd152203a41c1d315fc94b53f3c0c110 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/b3/fb48e10138dafbf20e5a8e91d811fd123e18e2 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/b3/fb48e10138dafbf20e5a8e91d811fd123e18e2
new file mode 100644
index 000000000..8b735f181
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/b3/fb48e10138dafbf20e5a8e91d811fd123e18e2 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/c0/762755620866d9c260e4e62d1c49de83edeecf b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/c0/762755620866d9c260e4e62d1c49de83edeecf
new file mode 100644
index 000000000..03cf3c80f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/c0/762755620866d9c260e4e62d1c49de83edeecf differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6
new file mode 100644
index 000000000..276616a2c
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6
@@ -0,0 +1 @@
+x
mͽ�0@ag��n&�?R 17\|��\��Ps)��]����E\n"!2�/+S����)%v�!�І+�Tnj�0�K��������NO���qm��"!�܄0���U�
;&�����c�p���=&�W��[;ќw��.��N{hI��p�'s~�����F�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e
new file mode 100644
index 000000000..5742c0fa8
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/e8/3b6d740630779f98d11a87576ba0f755c1c21f b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/e8/3b6d740630779f98d11a87576ba0f755c1c21f
new file mode 100644
index 000000000..982f82e8b
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/e8/3b6d740630779f98d11a87576ba0f755c1c21f differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/e9/615ab9d880fa7d5125af443c234230d53ea832 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/e9/615ab9d880fa7d5125af443c234230d53ea832
new file mode 100644
index 000000000..670938707
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/e9/615ab9d880fa7d5125af443c234230d53ea832
@@ -0,0 +1 @@
+x
m��j�0ES�+�Y#Y2,a�I�^Ҍc����j��le���p�U�mi�|zh�֕�+a_��(�)9�y�!�H�.p�9��� ��1fD;���S���u��'�%&�om�Q�7Y�7��Y���yΪ��������1`o1����ԟ�w
^sk��7x�<��p��H7��s���M�O�d�e�C�����3O�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae
new file mode 100644
index 000000000..2abbac391
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355 b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355
new file mode 100644
index 000000000..2ffcdf19f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/refs/heads/adding_poison b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/refs/heads/adding_poison
new file mode 100644
index 000000000..68f280a07
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/refs/heads/adding_poison
@@ -0,0 +1 @@
+e9615ab9d880fa7d5125af443c234230d53ea832
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/refs/heads/spell b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/refs/heads/spell
new file mode 100644
index 000000000..29bcd5b51
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/refs/heads/spell
@@ -0,0 +1 @@
+748437a3306b03a453584dbc529c67b0de823b78
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/refs/heads/switching_dark_fire b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/refs/heads/switching_dark_fire
new file mode 100644
index 000000000..5afcb2855
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/hogwarts_repo/refs/heads/switching_dark_fire
@@ -0,0 +1 @@
+4ee7e92b189817881f03b8dc60221020fe1327c4
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/merge_remote.sh b/missions/contrib/git_branching/00_prepare_bare_repo/merge_remote.sh
new file mode 100644
index 000000000..d125d7e1e
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/merge_remote.sh
@@ -0,0 +1,31 @@
+merge_remote() {
+  repo=$1
+  branch1=$2
+  branch2=$3
+  # if file created by `gsh check` of previous exercice is here
+  if [ -f $GSH_TMP/$repo ]
+  then
+    git co -b work $repo/spell
+    git merge $branch1 --no-edit
+    git merge $branch2 --no-edit
+    git co spell
+    git merge work
+    cp $MISSION_DIR/README.md .
+    git add README.md 
+    git ci --no-edit
+  fi
+}
+
+merge_remote cair_paravel adding_dark switching_air_earth &> /dev/null
+merge_remote hogwarts adding_poison switching_dark_fire &> /dev/null
+merge_remote novigrad adding_air switching_water_dark &> /dev/null
+
+# If previous exercice were not done in this session, typically with a `gsh goto`, one is created by default
+nb_repo=$(git remote show | wc -l)
+if [ $nb_repo -lt 3 ]
+then
+  echo "Warning: no history found in repos among cair_paravel, hogwards or novigrad you added in a previous exercice. cair_paravel repo has been set by default."
+  touch $GSH_TMP/cair_paravel
+  merge_remote cair_paravel adding_dark switching_air_earth &> /dev/null
+fi
+
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/README.md b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/README.md
new file mode 100644
index 000000000..501eff4a0
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/README.md
@@ -0,0 +1,3 @@
+## Amplification spell from Minas Tirith city
+
+This repository is used for git training based on [GameShell_git](https://github.com/MKessar/GameShell_git)
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell
new file mode 100644
index 000000000..929fac5bf
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell
@@ -0,0 +1,4 @@
+30 33
+30 11
+20 111
+20 55
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell_adding_moisture b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell_adding_moisture
new file mode 100644
index 000000000..91bdc7b7e
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell_adding_moisture
@@ -0,0 +1,5 @@
+30 33
+30 11
+30 111
+5  55
+5  88
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell_changing_proportion1 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell_changing_proportion1
new file mode 100644
index 000000000..cae3f592f
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell_changing_proportion1
@@ -0,0 +1,4 @@
+30 33
+30 11
+30 111
+10 55
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell_changing_proportion2 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell_changing_proportion2
new file mode 100644
index 000000000..32269c096
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell_changing_proportion2
@@ -0,0 +1,4 @@
+30 33
+30 11
+35 111
+5  55
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell_switching_magma_earth b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell_switching_magma_earth
new file mode 100644
index 000000000..d07a073b0
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_files/amplification.spell_switching_magma_earth
@@ -0,0 +1,4 @@
+30 44
+30 11
+30 111
+10 55
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/HEAD b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/HEAD
new file mode 100644
index 000000000..8d78c0dda
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/spell
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/config b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/config
new file mode 100644
index 000000000..07d359d07
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/config
@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/description b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/description
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/applypatch-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/applypatch-msg.sample
new file mode 100755
index 000000000..a5d7b84a6
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/applypatch-msg.sample
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/commit-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/commit-msg.sample
new file mode 100755
index 000000000..b58d1184a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/commit-msg.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/fsmonitor-watchman.sample b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/fsmonitor-watchman.sample
new file mode 100755
index 000000000..14ed0aa42
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/fsmonitor-watchman.sample
@@ -0,0 +1,173 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+	die "Unsupported query-fsmonitor hook version '$version'.\n" .
+	    "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
+
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
+
+	# In the query expression below we're asking for names of files that
+	# changed since $last_update_token but not from the .git folder.
+	#
+	# To accomplish this, we're using the "since" generator to use the
+	# recency index to select candidate nodes and "fields" to limit the
+	# output to file names only. Then we're using the "expression" term to
+	# further constrain the results.
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+	}
+	my $query = <<"	END";
+		["query", "$git_work_tree", {
+			"since": $last_update_token,
+			"fields": ["name"],
+			"expression": ["not", ["dirname", ".git"]]
+		}]
+	END
+
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
+	print CHLD_IN $query;
+	close CHLD_IN;
+	my $response = do {local $/; <CHLD_OUT>};
+
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
+	die "Watchman: command returned no output.\n" .
+	"Falling back to scanning...\n" if $response eq "";
+	die "Watchman: command returned invalid output: $response\n" .
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
+		$retry--;
+		my $response = qx/watchman watch "$git_work_tree"/;
+		die "Failed to make watchman watch '$git_work_tree'.\n" .
+		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
+
+		# Watchman will always return all files on the first query so
+		# return the fast "everything is dirty" flag to git and do the
+		# Watchman query just to get it over with now so we won't pay
+		# the cost in git to look up each individual file.
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
+		eval { launch_watchman() };
+		return 0;
+	}
+
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;
+
+	return 1;
+}
+
+sub get_working_dir {
+	my $working_dir;
+	if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+		$working_dir = Win32::GetCwd();
+		$working_dir =~ tr/\\/\//;
+	} else {
+		require Cwd;
+		$working_dir = Cwd::cwd();
+	}
+
+	return $working_dir;
+}
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/post-update.sample b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/post-update.sample
new file mode 100755
index 000000000..ec17ec193
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/post-update.sample
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-applypatch.sample b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-applypatch.sample
new file mode 100755
index 000000000..4142082bc
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-applypatch.sample
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-commit.sample b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-commit.sample
new file mode 100755
index 000000000..e144712c8
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-commit.sample
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=$(git hash-object -t tree /dev/null)
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --type=bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-merge-commit.sample b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-merge-commit.sample
new file mode 100755
index 000000000..399eab192
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-merge-commit.sample
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+        exec "$GIT_DIR/hooks/pre-commit"
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-push.sample b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-push.sample
new file mode 100755
index 000000000..4ce688d32
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-push.sample
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+	if test "$local_oid" = "$zero"
+	then
+		# Handle delete
+		:
+	else
+		if test "$remote_oid" = "$zero"
+		then
+			# New branch, examine all commits
+			range="$local_oid"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_oid..$local_oid"
+		fi
+
+		# Check for WIP commit
+		commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+		if test -n "$commit"
+		then
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-rebase.sample b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-rebase.sample
new file mode 100755
index 000000000..6cbef5c37
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-rebase.sample
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up to date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".
+
+DOC_END
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-receive.sample b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-receive.sample
new file mode 100755
index 000000000..a1fd29ec1
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/pre-receive.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to make use of push options.
+# The example simply echoes all push options that start with 'echoback='
+# and rejects all pushes when the "reject" push option is used.
+#
+# To enable this hook, rename this file to "pre-receive".
+
+if test -n "$GIT_PUSH_OPTION_COUNT"
+then
+	i=0
+	while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
+	do
+		eval "value=\$GIT_PUSH_OPTION_$i"
+		case "$value" in
+		echoback=*)
+			echo "echo from the pre-receive-hook: ${value#*=}" >&2
+			;;
+		reject)
+			exit 1
+		esac
+		i=$((i + 1))
+	done
+fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/prepare-commit-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/prepare-commit-msg.sample
new file mode 100755
index 000000000..10fa14c5a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/prepare-commit-msg.sample
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
+
+# case "$COMMIT_SOURCE,$SHA1" in
+#  ,|template,)
+#    /usr/bin/perl -i.bak -pe '
+#       print "\n" . `git diff --cached --name-status -r`
+# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+#  *) ;;
+# esac
+
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/push-to-checkout.sample b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/push-to-checkout.sample
new file mode 100755
index 000000000..af5a0c001
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/push-to-checkout.sample
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+	echo >&2 "$*"
+	exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+	die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+	die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+#   head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+	head=HEAD
+else
+	head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+	die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+	die "Could not update working tree to new HEAD"
+fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/update.sample b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/update.sample
new file mode 100755
index 000000000..c4d426bc6
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/hooks/update.sample
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to block unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/info/exclude b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/info/exclude
new file mode 100644
index 000000000..a5196d1be
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/0d/64c90abad74cd8742f75db1b5bc6308fab8a65 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/0d/64c90abad74cd8742f75db1b5bc6308fab8a65
new file mode 100644
index 000000000..3d6b80b71
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/0d/64c90abad74cd8742f75db1b5bc6308fab8a65 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/11/43e327b1bdcb513f7d35030973956147eafb4b b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/11/43e327b1bdcb513f7d35030973956147eafb4b
new file mode 100644
index 000000000..06ffa7f6d
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/11/43e327b1bdcb513f7d35030973956147eafb4b differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/23/14b1ad217fbfff25fea18693aab07beefc4c24 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/23/14b1ad217fbfff25fea18693aab07beefc4c24
new file mode 100644
index 000000000..fccb38511
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/23/14b1ad217fbfff25fea18693aab07beefc4c24 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e
new file mode 100644
index 000000000..67e064db6
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/32/269c09603fcc40b85048b1df1696ff3a03262e b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/32/269c09603fcc40b85048b1df1696ff3a03262e
new file mode 100644
index 000000000..00eb3ea8f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/32/269c09603fcc40b85048b1df1696ff3a03262e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/32/b26ad9a945bb52e15d4a286c7dd913121bdc75 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/32/b26ad9a945bb52e15d4a286c7dd913121bdc75
new file mode 100644
index 000000000..9bb22a03b
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/32/b26ad9a945bb52e15d4a286c7dd913121bdc75 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/4e/bd4e505380319474a149ac22449aafa64c552d b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/4e/bd4e505380319474a149ac22449aafa64c552d
new file mode 100644
index 000000000..5eed430c8
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/4e/bd4e505380319474a149ac22449aafa64c552d differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/50/1eff4a0e923a07c948ac4ef97428cdef3b1215 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/50/1eff4a0e923a07c948ac4ef97428cdef3b1215
new file mode 100644
index 000000000..be56c6b4f
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/50/1eff4a0e923a07c948ac4ef97428cdef3b1215
@@ -0,0 +1,2 @@
+x
U���0@���Kf�� fp(��!�-�zI�k�nbO�����\"�a8�=�rM����T@jH	�#+0#�F�{��8TT�m>�Ê
+������{�mSl�w^ǨZ�jL�����l�G�l��S�n8:"
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/52/4a5fb6558dc90b491867e54529d728e084235d b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/52/4a5fb6558dc90b491867e54529d728e084235d
new file mode 100644
index 000000000..1f45c163d
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/52/4a5fb6558dc90b491867e54529d728e084235d
@@ -0,0 +1 @@
+x
m��n� �S�۟da~H���kR�	Xb+����q��h���+f&�Z�
ʄ��D@Tt,苌��$ZOAm�;�DR>���L��E�Yg�䲳٢�i�~�!�d������X�+r;*���o�ƹ�2V�m�Sl��fg���b\��R�﯃^p�u��H�gY�%��Cni�>��F`��Զ�q0�O	S
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc
new file mode 100644
index 000000000..c3d0c4879
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/62/1d3d0ae7d75d5a3dc6081b9b5c4c4c4bc2bdf4 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/62/1d3d0ae7d75d5a3dc6081b9b5c4c4c4bc2bdf4
new file mode 100644
index 000000000..afecffb9a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/62/1d3d0ae7d75d5a3dc6081b9b5c4c4c4bc2bdf4
@@ -0,0 +1 @@
+x
m�1n� ESs��#Y�1#���&�`0Vl�0{�Dٔ�^���8���Ko"@j�	m�)%2I��M�~�^$H����y�9:v�xoH�Dʹ����pBB�5�=��\"�	n��{m�gi[Y�����h
�e���ב�Q�ߟ]|r�y�|�$�nǟ���Ciא�?2��g�V���V��3�R+
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e
new file mode 100644
index 000000000..b5286ff53
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97
new file mode 100644
index 000000000..e22ee2b07
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83
new file mode 100644
index 000000000..6ebd6dd24
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83
@@ -0,0 +1,3 @@
+x
m�=N�0@aj�b:
+����%����������Ďf� nO�PҾ��Km�J��Cg"��U�6�i�Z��������qI��T;x3e7��C�r
+c�3�f9��^yeI�/�����GY���V�y��ӵq"&�Cl��jt*����'������P����
��Z�0�ʰ��S�|f��i�z.�;��q/���LR�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/91/bdc7b7e1733b9d3adf0b821cabad616fa67fd9 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/91/bdc7b7e1733b9d3adf0b821cabad616fa67fd9
new file mode 100644
index 000000000..84b7f461d
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/91/bdc7b7e1733b9d3adf0b821cabad616fa67fd9 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/92/9fac5bf21e67b8e8ff7eb9edaf0d2fa9a3ee6e b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/92/9fac5bf21e67b8e8ff7eb9edaf0d2fa9a3ee6e
new file mode 100644
index 000000000..4c2ad24ab
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/92/9fac5bf21e67b8e8ff7eb9edaf0d2fa9a3ee6e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a
new file mode 100644
index 000000000..2ad06ec33
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b
new file mode 100644
index 000000000..b8debac99
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/c7/b62e216c846b2e7eeb67d568b76da5490c6e85 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/c7/b62e216c846b2e7eeb67d568b76da5490c6e85
new file mode 100644
index 000000000..86ac9762c
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/c7/b62e216c846b2e7eeb67d568b76da5490c6e85
@@ -0,0 +1,2 @@
+x
m��n� ES��G��H��vI��`0V��0��~�2��)ι�պ
P�FgD�Y+0�,�쒶RKﴷ3ǔ�	�:�
+j����U�6R�]J5����/t$�3\�Ǹ�����Q�o�zN���+���e6���R�ߟ�;��e�;�g�.��L�An����?q~n#��TZ+
SE|
��QC
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/ca/e3f592f93656f6ec0a4a35e962378ef1e73c73 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/ca/e3f592f93656f6ec0a4a35e962378ef1e73c73
new file mode 100644
index 000000000..f1d44b096
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/ca/e3f592f93656f6ec0a4a35e962378ef1e73c73 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/d0/7a073b004dc256f9fc320d7e4a5af261dc948f b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/d0/7a073b004dc256f9fc320d7e4a5af261dc948f
new file mode 100644
index 000000000..51857c703
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/d0/7a073b004dc256f9fc320d7e4a5af261dc948f differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6
new file mode 100644
index 000000000..276616a2c
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6
@@ -0,0 +1 @@
+x
mͽ�0@ag��n&�?R 17\|��\��Ps)��]����E\n"!2�/+S����)%v�!�І+�Tnj�0�K��������NO���qm��"!�܄0���U�
;&�����c�p���=&�W��[;ќw��.��N{hI��p�'s~�����F�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/e0/9f9e4f4048721a415fc3b706ca1e5c3a3b8076 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/e0/9f9e4f4048721a415fc3b706ca1e5c3a3b8076
new file mode 100644
index 000000000..92ad9e679
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/e0/9f9e4f4048721a415fc3b706ca1e5c3a3b8076 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e
new file mode 100644
index 000000000..5742c0fa8
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae
new file mode 100644
index 000000000..2abbac391
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/ee/f3bfa8f0b8eae0a58e90f34370f3fbe28b4179 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/ee/f3bfa8f0b8eae0a58e90f34370f3fbe28b4179
new file mode 100644
index 000000000..2ffbdb398
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/ee/f3bfa8f0b8eae0a58e90f34370f3fbe28b4179 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355 b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355
new file mode 100644
index 000000000..2ffcdf19f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/refs/heads/adding_moisture b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/refs/heads/adding_moisture
new file mode 100644
index 000000000..917588db9
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/refs/heads/adding_moisture
@@ -0,0 +1 @@
+524a5fb6558dc90b491867e54529d728e084235d
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/refs/heads/spell b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/refs/heads/spell
new file mode 100644
index 000000000..19a476a43
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/refs/heads/spell
@@ -0,0 +1 @@
+621d3d0ae7d75d5a3dc6081b9b5c4c4c4bc2bdf4
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/refs/heads/switching_magma_earth b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/refs/heads/switching_magma_earth
new file mode 100644
index 000000000..0adae4286
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/minas_tirith_repo/refs/heads/switching_magma_earth
@@ -0,0 +1 @@
+c7b62e216c846b2e7eeb67d568b76da5490c6e85
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/README.md b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/README.md
new file mode 100644
index 000000000..920ba881e
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/README.md
@@ -0,0 +1,3 @@
+## No regen spell from Novigrad city
+
+This repository is used for git training based on [GameShell_git](https://github.com/MKessar/GameShell_git)
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell
new file mode 100644
index 000000000..b57ffe95a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell
@@ -0,0 +1,4 @@
+15 33
+15 66
+30 88
+40 99
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell_adding_air b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell_adding_air
new file mode 100644
index 000000000..fd6fe29f8
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell_adding_air
@@ -0,0 +1,5 @@
+15 33
+15 66
+50 88
+15 99
+05 11
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell_changing_proportion1 b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell_changing_proportion1
new file mode 100644
index 000000000..e00eae001
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell_changing_proportion1
@@ -0,0 +1,4 @@
+15 33
+15 66
+50 88
+20 99
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell_changing_proportion2 b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell_changing_proportion2
new file mode 100644
index 000000000..98c577cb4
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell_changing_proportion2
@@ -0,0 +1,4 @@
+15 33
+15 66
+55 88
+15 99
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell_switching_water_dark b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell_switching_water_dark
new file mode 100644
index 000000000..a34174af2
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_files/no_regen.spell_switching_water_dark
@@ -0,0 +1,4 @@
+15 55
+15 66
+50 88
+20 99
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/HEAD b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/HEAD
new file mode 100644
index 000000000..8d78c0dda
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/spell
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/config b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/config
new file mode 100644
index 000000000..07d359d07
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/config
@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/description b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/description
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/applypatch-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/applypatch-msg.sample
new file mode 100755
index 000000000..a5d7b84a6
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/applypatch-msg.sample
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/commit-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/commit-msg.sample
new file mode 100755
index 000000000..b58d1184a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/commit-msg.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/fsmonitor-watchman.sample b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/fsmonitor-watchman.sample
new file mode 100755
index 000000000..14ed0aa42
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/fsmonitor-watchman.sample
@@ -0,0 +1,173 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+	die "Unsupported query-fsmonitor hook version '$version'.\n" .
+	    "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
+
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
+
+	# In the query expression below we're asking for names of files that
+	# changed since $last_update_token but not from the .git folder.
+	#
+	# To accomplish this, we're using the "since" generator to use the
+	# recency index to select candidate nodes and "fields" to limit the
+	# output to file names only. Then we're using the "expression" term to
+	# further constrain the results.
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+	}
+	my $query = <<"	END";
+		["query", "$git_work_tree", {
+			"since": $last_update_token,
+			"fields": ["name"],
+			"expression": ["not", ["dirname", ".git"]]
+		}]
+	END
+
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
+	print CHLD_IN $query;
+	close CHLD_IN;
+	my $response = do {local $/; <CHLD_OUT>};
+
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
+	die "Watchman: command returned no output.\n" .
+	"Falling back to scanning...\n" if $response eq "";
+	die "Watchman: command returned invalid output: $response\n" .
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
+		$retry--;
+		my $response = qx/watchman watch "$git_work_tree"/;
+		die "Failed to make watchman watch '$git_work_tree'.\n" .
+		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
+
+		# Watchman will always return all files on the first query so
+		# return the fast "everything is dirty" flag to git and do the
+		# Watchman query just to get it over with now so we won't pay
+		# the cost in git to look up each individual file.
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
+		eval { launch_watchman() };
+		return 0;
+	}
+
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;
+
+	return 1;
+}
+
+sub get_working_dir {
+	my $working_dir;
+	if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+		$working_dir = Win32::GetCwd();
+		$working_dir =~ tr/\\/\//;
+	} else {
+		require Cwd;
+		$working_dir = Cwd::cwd();
+	}
+
+	return $working_dir;
+}
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/post-update.sample b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/post-update.sample
new file mode 100755
index 000000000..ec17ec193
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/post-update.sample
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-applypatch.sample b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-applypatch.sample
new file mode 100755
index 000000000..4142082bc
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-applypatch.sample
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-commit.sample b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-commit.sample
new file mode 100755
index 000000000..e144712c8
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-commit.sample
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=$(git hash-object -t tree /dev/null)
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --type=bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-merge-commit.sample b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-merge-commit.sample
new file mode 100755
index 000000000..399eab192
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-merge-commit.sample
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+        exec "$GIT_DIR/hooks/pre-commit"
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-push.sample b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-push.sample
new file mode 100755
index 000000000..4ce688d32
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-push.sample
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+	if test "$local_oid" = "$zero"
+	then
+		# Handle delete
+		:
+	else
+		if test "$remote_oid" = "$zero"
+		then
+			# New branch, examine all commits
+			range="$local_oid"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_oid..$local_oid"
+		fi
+
+		# Check for WIP commit
+		commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+		if test -n "$commit"
+		then
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-rebase.sample b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-rebase.sample
new file mode 100755
index 000000000..6cbef5c37
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-rebase.sample
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up to date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".
+
+DOC_END
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-receive.sample b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-receive.sample
new file mode 100755
index 000000000..a1fd29ec1
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/pre-receive.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to make use of push options.
+# The example simply echoes all push options that start with 'echoback='
+# and rejects all pushes when the "reject" push option is used.
+#
+# To enable this hook, rename this file to "pre-receive".
+
+if test -n "$GIT_PUSH_OPTION_COUNT"
+then
+	i=0
+	while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
+	do
+		eval "value=\$GIT_PUSH_OPTION_$i"
+		case "$value" in
+		echoback=*)
+			echo "echo from the pre-receive-hook: ${value#*=}" >&2
+			;;
+		reject)
+			exit 1
+		esac
+		i=$((i + 1))
+	done
+fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/prepare-commit-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/prepare-commit-msg.sample
new file mode 100755
index 000000000..10fa14c5a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/prepare-commit-msg.sample
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
+
+# case "$COMMIT_SOURCE,$SHA1" in
+#  ,|template,)
+#    /usr/bin/perl -i.bak -pe '
+#       print "\n" . `git diff --cached --name-status -r`
+# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+#  *) ;;
+# esac
+
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/push-to-checkout.sample b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/push-to-checkout.sample
new file mode 100755
index 000000000..af5a0c001
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/push-to-checkout.sample
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+	echo >&2 "$*"
+	exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+	die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+	die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+#   head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+	head=HEAD
+else
+	head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+	die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+	die "Could not update working tree to new HEAD"
+fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/update.sample b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/update.sample
new file mode 100755
index 000000000..c4d426bc6
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/hooks/update.sample
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to block unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/info/exclude b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/info/exclude
new file mode 100644
index 000000000..a5196d1be
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/17/2b7fbbf6f77747b56e67f8871699f5d8834cdf b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/17/2b7fbbf6f77747b56e67f8871699f5d8834cdf
new file mode 100644
index 000000000..faf5d303a
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/17/2b7fbbf6f77747b56e67f8871699f5d8834cdf differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e
new file mode 100644
index 000000000..67e064db6
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/33/39a20ee97d431e9a57e2747b9f7287bd25a943 b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/33/39a20ee97d431e9a57e2747b9f7287bd25a943
new file mode 100644
index 000000000..4581b236c
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/33/39a20ee97d431e9a57e2747b9f7287bd25a943 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/40/a54d009c4fcd63f28eb0d8d1f2b254ca129a28 b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/40/a54d009c4fcd63f28eb0d8d1f2b254ca129a28
new file mode 100644
index 000000000..cb19bb918
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/40/a54d009c4fcd63f28eb0d8d1f2b254ca129a28 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/58/ea275d9219129fee6f0e2ce86b3417dd100c4d b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/58/ea275d9219129fee6f0e2ce86b3417dd100c4d
new file mode 100644
index 000000000..ddd48034f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/58/ea275d9219129fee6f0e2ce86b3417dd100c4d differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc
new file mode 100644
index 000000000..c3d0c4879
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/60/9900196b217e1e1281b9c31cab818c273262ff b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/60/9900196b217e1e1281b9c31cab818c273262ff
new file mode 100644
index 000000000..537d63134
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/60/9900196b217e1e1281b9c31cab818c273262ff differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e
new file mode 100644
index 000000000..b5286ff53
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/6f/a09fd0b9b92e836cf32f2ff7a0cbf69481161a b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/6f/a09fd0b9b92e836cf32f2ff7a0cbf69481161a
new file mode 100644
index 000000000..418d396b4
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/6f/a09fd0b9b92e836cf32f2ff7a0cbf69481161a differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/71/7e0fa683b1cbf60c158663bff0be1ea07f5720 b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/71/7e0fa683b1cbf60c158663bff0be1ea07f5720
new file mode 100644
index 000000000..e063a7d2c
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/71/7e0fa683b1cbf60c158663bff0be1ea07f5720 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97 b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97
new file mode 100644
index 000000000..e22ee2b07
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83 b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83
new file mode 100644
index 000000000..6ebd6dd24
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83
@@ -0,0 +1,3 @@
+x
m�=N�0@aj�b:
+����%����������Ďf� nO�PҾ��Km�J��Cg"��U�6�i�Z��������qI��T;x3e7��C�r
+c�3�f9��^yeI�/�����GY���V�y��ӵq"&�Cl��jt*����'������P����
��Z�0�ʰ��S�|f��i�z.�;��q/���LR�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/7d/8f0bfd45d007315c774a62d054ecd94f8a611f b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/7d/8f0bfd45d007315c774a62d054ecd94f8a611f
new file mode 100644
index 000000000..a0eea860f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/7d/8f0bfd45d007315c774a62d054ecd94f8a611f differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/92/0ba881efd9c37da728e1af1e3b8e588b3f4fe3 b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/92/0ba881efd9c37da728e1af1e3b8e588b3f4fe3
new file mode 100644
index 000000000..f6a871606
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/92/0ba881efd9c37da728e1af1e3b8e588b3f4fe3
@@ -0,0 +1,3 @@
+x
U��
+�0@��]t1��8�]t��M��&�B��8:�����<��M�AO�!�R�<�Ĕ��`d7€��H(-�$��+4Z$�0CDe�K�~�
+</.�{j�w^ۤZ�lm����@�ޮAı�+w�8�6~
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/98/c577cb4626ad99461b77208976d7ab64ede30c b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/98/c577cb4626ad99461b77208976d7ab64ede30c
new file mode 100644
index 000000000..f1c152a0f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/98/c577cb4626ad99461b77208976d7ab64ede30c differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/a3/4174af2c67e32869d63bff643ebb633b94864f b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/a3/4174af2c67e32869d63bff643ebb633b94864f
new file mode 100644
index 000000000..e47af01e1
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/a3/4174af2c67e32869d63bff643ebb633b94864f differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a
new file mode 100644
index 000000000..2ad06ec33
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b
new file mode 100644
index 000000000..b8debac99
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/b5/7ffe95a6e3fe71a5b4a55b2d394f61d6a1b440 b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/b5/7ffe95a6e3fe71a5b4a55b2d394f61d6a1b440
new file mode 100644
index 000000000..e4d8fbafb
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/b5/7ffe95a6e3fe71a5b4a55b2d394f61d6a1b440 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/d5/2583bfbaa08480b0472958972e35c3b9dd0765 b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/d5/2583bfbaa08480b0472958972e35c3b9dd0765
new file mode 100644
index 000000000..3ffa0df1b
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/d5/2583bfbaa08480b0472958972e35c3b9dd0765 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6 b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6
new file mode 100644
index 000000000..276616a2c
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6
@@ -0,0 +1 @@
+x
mͽ�0@ag��n&�?R 17\|��\��Ps)��]����E\n"!2�/+S����)%v�!�І+�Tnj�0�K��������NO���qm��"!�܄0���U�
;&�����c�p���=&�W��[;ќw��.��N{hI��p�'s~�����F�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/e0/0eae0010bc68a2dc4988e4b57a1870b0df9cfd b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/e0/0eae0010bc68a2dc4988e4b57a1870b0df9cfd
new file mode 100644
index 000000000..977d83eb8
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/e0/0eae0010bc68a2dc4988e4b57a1870b0df9cfd differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e
new file mode 100644
index 000000000..5742c0fa8
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae
new file mode 100644
index 000000000..2abbac391
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355 b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355
new file mode 100644
index 000000000..2ffcdf19f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/fa/f256dd085254a1eafe29104ae73329e3920b0a b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/fa/f256dd085254a1eafe29104ae73329e3920b0a
new file mode 100644
index 000000000..d662431ad
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/fa/f256dd085254a1eafe29104ae73329e3920b0a
@@ -0,0 +1 @@
+x
mλj�0@������X[�%l�M�@J=F�H,�����ϒl������
r���D��4V��G�-ԫtƺU�2Q����gj4z���:Ǵ�,-L6�Yit��t^Z�o�t�7j�21$�Wjq �����Q諎X�����3̫��3Z)8�D�wy܍?F�t������Q��W.����F���V���󨽉��T�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/fd/6fe29f8f8ec6fa1721423e156bbd67d833f3c2 b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/fd/6fe29f8f8ec6fa1721423e156bbd67d833f3c2
new file mode 100644
index 000000000..e07761643
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/objects/fd/6fe29f8f8ec6fa1721423e156bbd67d833f3c2 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/refs/heads/adding_air b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/refs/heads/adding_air
new file mode 100644
index 000000000..b7b38f6d9
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/refs/heads/adding_air
@@ -0,0 +1 @@
+6fa09fd0b9b92e836cf32f2ff7a0cbf69481161a
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/refs/heads/spell b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/refs/heads/spell
new file mode 100644
index 000000000..13aab0fd5
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/refs/heads/spell
@@ -0,0 +1 @@
+609900196b217e1e1281b9c31cab818c273262ff
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/refs/heads/switching_water_dark b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/refs/heads/switching_water_dark
new file mode 100644
index 000000000..c871d5720
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/novigrad_repo/refs/heads/switching_water_dark
@@ -0,0 +1 @@
+717e0fa683b1cbf60c158663bff0be1ea07f5720
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/remove_marker_branch_repo.sh b/missions/contrib/git_branching/00_prepare_bare_repo/remove_marker_branch_repo.sh
new file mode 100644
index 000000000..b22ab1790
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/remove_marker_branch_repo.sh
@@ -0,0 +1 @@
+git push -d origin spell_init power_marker adding_earth_merged conflict_solved merge_remote
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/HEAD b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/HEAD
new file mode 100644
index 000000000..8d78c0dda
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/spell
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/config b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/config
new file mode 100644
index 000000000..07d359d07
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/config
@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/description b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/description
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/applypatch-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/applypatch-msg.sample
new file mode 100755
index 000000000..a5d7b84a6
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/applypatch-msg.sample
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/commit-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/commit-msg.sample
new file mode 100755
index 000000000..b58d1184a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/commit-msg.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/fsmonitor-watchman.sample b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/fsmonitor-watchman.sample
new file mode 100755
index 000000000..14ed0aa42
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/fsmonitor-watchman.sample
@@ -0,0 +1,173 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+	die "Unsupported query-fsmonitor hook version '$version'.\n" .
+	    "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
+
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
+
+	# In the query expression below we're asking for names of files that
+	# changed since $last_update_token but not from the .git folder.
+	#
+	# To accomplish this, we're using the "since" generator to use the
+	# recency index to select candidate nodes and "fields" to limit the
+	# output to file names only. Then we're using the "expression" term to
+	# further constrain the results.
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+	}
+	my $query = <<"	END";
+		["query", "$git_work_tree", {
+			"since": $last_update_token,
+			"fields": ["name"],
+			"expression": ["not", ["dirname", ".git"]]
+		}]
+	END
+
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
+	print CHLD_IN $query;
+	close CHLD_IN;
+	my $response = do {local $/; <CHLD_OUT>};
+
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
+	die "Watchman: command returned no output.\n" .
+	"Falling back to scanning...\n" if $response eq "";
+	die "Watchman: command returned invalid output: $response\n" .
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
+		$retry--;
+		my $response = qx/watchman watch "$git_work_tree"/;
+		die "Failed to make watchman watch '$git_work_tree'.\n" .
+		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
+
+		# Watchman will always return all files on the first query so
+		# return the fast "everything is dirty" flag to git and do the
+		# Watchman query just to get it over with now so we won't pay
+		# the cost in git to look up each individual file.
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
+		eval { launch_watchman() };
+		return 0;
+	}
+
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;
+
+	return 1;
+}
+
+sub get_working_dir {
+	my $working_dir;
+	if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+		$working_dir = Win32::GetCwd();
+		$working_dir =~ tr/\\/\//;
+	} else {
+		require Cwd;
+		$working_dir = Cwd::cwd();
+	}
+
+	return $working_dir;
+}
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/post-update.sample b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/post-update.sample
new file mode 100755
index 000000000..ec17ec193
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/post-update.sample
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-applypatch.sample b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-applypatch.sample
new file mode 100755
index 000000000..4142082bc
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-applypatch.sample
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-commit.sample b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-commit.sample
new file mode 100755
index 000000000..e144712c8
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-commit.sample
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=$(git hash-object -t tree /dev/null)
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --type=bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-merge-commit.sample b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-merge-commit.sample
new file mode 100755
index 000000000..399eab192
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-merge-commit.sample
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git merge" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message to
+# stderr if it wants to stop the merge commit.
+#
+# To enable this hook, rename this file to "pre-merge-commit".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+        exec "$GIT_DIR/hooks/pre-commit"
+:
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-push.sample b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-push.sample
new file mode 100755
index 000000000..4ce688d32
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-push.sample
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+	if test "$local_oid" = "$zero"
+	then
+		# Handle delete
+		:
+	else
+		if test "$remote_oid" = "$zero"
+		then
+			# New branch, examine all commits
+			range="$local_oid"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_oid..$local_oid"
+		fi
+
+		# Check for WIP commit
+		commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+		if test -n "$commit"
+		then
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-rebase.sample b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-rebase.sample
new file mode 100755
index 000000000..6cbef5c37
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-rebase.sample
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up to date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".
+
+DOC_END
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-receive.sample b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-receive.sample
new file mode 100755
index 000000000..a1fd29ec1
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/pre-receive.sample
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to make use of push options.
+# The example simply echoes all push options that start with 'echoback='
+# and rejects all pushes when the "reject" push option is used.
+#
+# To enable this hook, rename this file to "pre-receive".
+
+if test -n "$GIT_PUSH_OPTION_COUNT"
+then
+	i=0
+	while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
+	do
+		eval "value=\$GIT_PUSH_OPTION_$i"
+		case "$value" in
+		echoback=*)
+			echo "echo from the pre-receive-hook: ${value#*=}" >&2
+			;;
+		reject)
+			exit 1
+		esac
+		i=$((i + 1))
+	done
+fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/prepare-commit-msg.sample b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/prepare-commit-msg.sample
new file mode 100755
index 000000000..10fa14c5a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/prepare-commit-msg.sample
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
+
+# case "$COMMIT_SOURCE,$SHA1" in
+#  ,|template,)
+#    /usr/bin/perl -i.bak -pe '
+#       print "\n" . `git diff --cached --name-status -r`
+# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+#  *) ;;
+# esac
+
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/push-to-checkout.sample b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/push-to-checkout.sample
new file mode 100755
index 000000000..af5a0c001
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/push-to-checkout.sample
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+	echo >&2 "$*"
+	exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+	die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+	die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+#   head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+	head=HEAD
+else
+	head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+	die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+	die "Could not update working tree to new HEAD"
+fi
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/update.sample b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/update.sample
new file mode 100755
index 000000000..c4d426bc6
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/hooks/update.sample
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to block unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/info/exclude b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/info/exclude
new file mode 100644
index 000000000..a5196d1be
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/06/f3e0c4ab9a755e1f1853b1048c36c21bc58a37 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/06/f3e0c4ab9a755e1f1853b1048c36c21bc58a37
new file mode 100644
index 000000000..af84d07ec
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/06/f3e0c4ab9a755e1f1853b1048c36c21bc58a37 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/0c/05ba79d0f554a17976bb1eb601e4f25b586028 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/0c/05ba79d0f554a17976bb1eb601e4f25b586028
new file mode 100644
index 000000000..4ba90f5b2
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/0c/05ba79d0f554a17976bb1eb601e4f25b586028 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/0d/64c90abad74cd8742f75db1b5bc6308fab8a65 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/0d/64c90abad74cd8742f75db1b5bc6308fab8a65
new file mode 100644
index 000000000..3d6b80b71
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/0d/64c90abad74cd8742f75db1b5bc6308fab8a65 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/11/43e327b1bdcb513f7d35030973956147eafb4b b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/11/43e327b1bdcb513f7d35030973956147eafb4b
new file mode 100644
index 000000000..06ffa7f6d
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/11/43e327b1bdcb513f7d35030973956147eafb4b differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/23/14b1ad217fbfff25fea18693aab07beefc4c24 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/23/14b1ad217fbfff25fea18693aab07beefc4c24
new file mode 100644
index 000000000..fccb38511
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/23/14b1ad217fbfff25fea18693aab07beefc4c24 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e
new file mode 100644
index 000000000..67e064db6
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/28/57cfb356866686d9beb1bcb20d3bac9126051e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/2d/833c4a0155a9b3d3cb7ecdeacbe3ee90c43d65 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/2d/833c4a0155a9b3d3cb7ecdeacbe3ee90c43d65
new file mode 100644
index 000000000..b2e13e2e6
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/2d/833c4a0155a9b3d3cb7ecdeacbe3ee90c43d65
@@ -0,0 +1,2 @@
+x
��Kj1��S�΋�QK�O�	Yz�C�5��������$!ȶ�W�ʾ�s��֛*�q�!֘��`b0J4&*1yo���R@��t��kM��(PV�8��X�+�")d.���9�+Ĥ��[r��GD;
+Z�mR��C~�iop˽O�>����pY�y�!�ek�sm��;D��n�1C�>������KAZ�����|�y�;�]��	/Db�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/31/af41108274b086a407c393fb91eef137bf1c06 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/31/af41108274b086a407c393fb91eef137bf1c06
new file mode 100644
index 000000000..5f5abe75d
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/31/af41108274b086a407c393fb91eef137bf1c06 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/31/f7c8dd6d4973cef444c5573d8425a7d4e451bd b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/31/f7c8dd6d4973cef444c5573d8425a7d4e451bd
new file mode 100644
index 000000000..ee78025e1
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/31/f7c8dd6d4973cef444c5573d8425a7d4e451bd
@@ -0,0 +1,2 @@
+x
��Mj1@�}
+u]��B貛BV��@�	�B�_hz�n����>�f���bS0u�(�[��R�}#E|�����>�O���QC����`��D��b��!	KN����}™��M����K�8��>�]��~����'�T	�pAt�;k�ό�9�ߛɪ��6^�hlS1
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/32/269c09603fcc40b85048b1df1696ff3a03262e b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/32/269c09603fcc40b85048b1df1696ff3a03262e
new file mode 100644
index 000000000..00eb3ea8f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/32/269c09603fcc40b85048b1df1696ff3a03262e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/32/b26ad9a945bb52e15d4a286c7dd913121bdc75 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/32/b26ad9a945bb52e15d4a286c7dd913121bdc75
new file mode 100644
index 000000000..9bb22a03b
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/32/b26ad9a945bb52e15d4a286c7dd913121bdc75 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/3f/28e01bf5592f5e7a40a366a3a30e96d3a75c84 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/3f/28e01bf5592f5e7a40a366a3a30e96d3a75c84
new file mode 100644
index 000000000..42739e668
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/3f/28e01bf5592f5e7a40a366a3a30e96d3a75c84 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/42/faf9a37ddd5b2e6c6f10c0abe9098ab7a3e0c7 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/42/faf9a37ddd5b2e6c6f10c0abe9098ab7a3e0c7
new file mode 100644
index 000000000..b59d97110
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/42/faf9a37ddd5b2e6c6f10c0abe9098ab7a3e0c7 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/4e/bd4e505380319474a149ac22449aafa64c552d b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/4e/bd4e505380319474a149ac22449aafa64c552d
new file mode 100644
index 000000000..5eed430c8
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/4e/bd4e505380319474a149ac22449aafa64c552d differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/50/1eff4a0e923a07c948ac4ef97428cdef3b1215 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/50/1eff4a0e923a07c948ac4ef97428cdef3b1215
new file mode 100644
index 000000000..be56c6b4f
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/50/1eff4a0e923a07c948ac4ef97428cdef3b1215
@@ -0,0 +1,2 @@
+x
U���0@���Kf�� fp(��!�-�zI�k�nbO�����\"�a8�=�rM����T@jH	�#+0#�F�{��8TT�m>�Ê
+������{�mSl�w^ǨZ�jL�����l�G�l��S�n8:"
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/52/4a5fb6558dc90b491867e54529d728e084235d b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/52/4a5fb6558dc90b491867e54529d728e084235d
new file mode 100644
index 000000000..1f45c163d
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/52/4a5fb6558dc90b491867e54529d728e084235d
@@ -0,0 +1 @@
+x
m��n� �S�۟da~H���kR�	Xb+����q��h���+f&�Z�
ʄ��D@Tt,苌��$ZOAm�;�DR>���L��E�Yg�䲳٢�i�~�!�d������X�+r;*���o�ƹ�2V�m�Sl��fg���b\��R�﯃^p�u��H�gY�%��Cni�>��F`��Զ�q0�O	S
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/5a/7b45594e1e8524334b9d112db12e5b728e219e b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/5a/7b45594e1e8524334b9d112db12e5b728e219e
new file mode 100644
index 000000000..ebdd67125
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/5a/7b45594e1e8524334b9d112db12e5b728e219e
@@ -0,0 +1,3 @@
+x
��Ij1E��S�΋��P�
B�2�!���[`uY}����>>����{�`
>�!�� J�JM%񌊭sl�*��X��.w�M(�TNI|
=�wR**�AR �L(
��{2�T�#
+%G�0�����}4����\�
�smr�;K���K�%�����m<�u���d��.jxVF�%�M��f�ȸ
+��[^�ĥ�������ǐ�m���~k�'��g!
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/5f/f8beb34647b9e53970949cab95e4ccb86a9c72 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/5f/f8beb34647b9e53970949cab95e4ccb86a9c72
new file mode 100644
index 000000000..399a33a3a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/5f/f8beb34647b9e53970949cab95e4ccb86a9c72
@@ -0,0 +1 @@
+x
��Ij1����O0*���&�(���&=Y�����~<~x|l�2���0���N{��R��9���gv�-V�\�.�e୒�;��B�9*6T����&����j��Zl�$Ǣ�{!���
�����nc>:���"7x%QY�ۯ��y�_Oڟ
Sp�£��L�}n�?3�ή�����!�	t��r�'��b�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc
new file mode 100644
index 000000000..c3d0c4879
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/60/2d35941f6639ceed367b86fefa618a73fb58cc differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/61/e8c49b42a4bb4d32481ec0c6388cdf7f888c9a b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/61/e8c49b42a4bb4d32481ec0c6388cdf7f888c9a
new file mode 100644
index 000000000..82b970cb0
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/61/e8c49b42a4bb4d32481ec0c6388cdf7f888c9a differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/62/1d3d0ae7d75d5a3dc6081b9b5c4c4c4bc2bdf4 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/62/1d3d0ae7d75d5a3dc6081b9b5c4c4c4bc2bdf4
new file mode 100644
index 000000000..afecffb9a
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/62/1d3d0ae7d75d5a3dc6081b9b5c4c4c4bc2bdf4
@@ -0,0 +1 @@
+x
m�1n� ESs��#Y�1#���&�`0Vl�0{�Dٔ�^���8���Ko"@j�	m�)%2I��M�~�^$H����y�9:v�xoH�Dʹ����pBB�5�=��\"�	n��{m�gi[Y�����h
�e���ב�Q�ߟ]|r�y�|�$�nǟ���Ciא�?2��g�V���V��3�R+
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e
new file mode 100644
index 000000000..b5286ff53
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/63/8d5730508d9940f91abdbfaf379ddcba61614e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/6e/3c3f9f48220f5d17df95d1514c082250faebe6 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/6e/3c3f9f48220f5d17df95d1514c082250faebe6
new file mode 100644
index 000000000..5a1901b8d
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/6e/3c3f9f48220f5d17df95d1514c082250faebe6 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/71/fb0498936cc380a0064b08a523cf9a526088e5 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/71/fb0498936cc380a0064b08a523cf9a526088e5
new file mode 100644
index 000000000..da6e6cd62
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/71/fb0498936cc380a0064b08a523cf9a526088e5 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97
new file mode 100644
index 000000000..e22ee2b07
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/76/08c9694e6dd9e678219e4c0a8d2ce7064e3e97 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/79/561a946cf22f6df968ea518a9593e591330916 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/79/561a946cf22f6df968ea518a9593e591330916
new file mode 100644
index 000000000..3ba56fa0d
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/79/561a946cf22f6df968ea518a9593e591330916 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83
new file mode 100644
index 000000000..6ebd6dd24
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/7a/e32bd02d811dc1782608525c0e2475811ebd83
@@ -0,0 +1,3 @@
+x
m�=N�0@aj�b:
+����%����������Ďf� nO�PҾ��Km�J��Cg"��U�6�i�Z��������qI��T;x3e7��C�r
+c�3�f9��^yeI�/�����GY���V�y��ӵq"&�Cl��jt*����'������P����
��Z�0�ʰ��S�|f��i�z.�;��q/���LR�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/7d/da67f789ca60760e44d856f4945525b683861b b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/7d/da67f789ca60760e44d856f4945525b683861b
new file mode 100644
index 000000000..71d3c99eb
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/7d/da67f789ca60760e44d856f4945525b683861b differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/86/dc788acf4dfda190a33d537edffff26f0ea3f5 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/86/dc788acf4dfda190a33d537edffff26f0ea3f5
new file mode 100644
index 000000000..3f68db65a
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/86/dc788acf4dfda190a33d537edffff26f0ea3f5 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/91/bdc7b7e1733b9d3adf0b821cabad616fa67fd9 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/91/bdc7b7e1733b9d3adf0b821cabad616fa67fd9
new file mode 100644
index 000000000..84b7f461d
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/91/bdc7b7e1733b9d3adf0b821cabad616fa67fd9 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/92/756ffc4bb67eb38304e4616f6f89a12a10e9c9 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/92/756ffc4bb67eb38304e4616f6f89a12a10e9c9
new file mode 100644
index 000000000..c9135c203
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/92/756ffc4bb67eb38304e4616f6f89a12a10e9c9 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/92/9fac5bf21e67b8e8ff7eb9edaf0d2fa9a3ee6e b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/92/9fac5bf21e67b8e8ff7eb9edaf0d2fa9a3ee6e
new file mode 100644
index 000000000..4c2ad24ab
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/92/9fac5bf21e67b8e8ff7eb9edaf0d2fa9a3ee6e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/93/75b3056bb3cfd8bc9024f59cfc16fc6659088b b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/93/75b3056bb3cfd8bc9024f59cfc16fc6659088b
new file mode 100644
index 000000000..899069b5c
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/93/75b3056bb3cfd8bc9024f59cfc16fc6659088b
@@ -0,0 +1 @@
+x
mλN�0�a�<�tH��%�����7�3$��F�^oO�PR�+~���}�`\��B�l����(�EO��1^������j�`��'���K�NqԘJbd;�Rr �v4�/M�����ۺ���'n���~�ӥI&!1cj��z�:����e���k����/+]��i���'��+�\�2���������e�
aO(
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a
new file mode 100644
index 000000000..2ad06ec33
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/a5/5368d871bee383b642518d65468350bba1e20a differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b
new file mode 100644
index 000000000..b8debac99
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/ad/e73b98e1b8073c213970f4ab1098107cd4eb0b differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/b4/e5e469d975c0f9b9400e07b581bf8101cac76f b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/b4/e5e469d975c0f9b9400e07b581bf8101cac76f
new file mode 100644
index 000000000..383252e97
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/b4/e5e469d975c0f9b9400e07b581bf8101cac76f
@@ -0,0 +1 @@
+x
mνj1��z��R����s`��7��+i�'|?A�1~{;e��b��-Ki@=��*���!�8���9�d4:�1�Q;vnĘ����6�,�bF�A뜴�0X�	�zo�*1��ܦ��ǥ̼�g�_ᛯ������m;���VnЖ�
	Q���&�����,����O��)����n���(ι�G��qj�U�L~
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/c7/b62e216c846b2e7eeb67d568b76da5490c6e85 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/c7/b62e216c846b2e7eeb67d568b76da5490c6e85
new file mode 100644
index 000000000..86ac9762c
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/c7/b62e216c846b2e7eeb67d568b76da5490c6e85
@@ -0,0 +1,2 @@
+x
m��n� ES��G��H��vI��`0V��0��~�2��)ι�պ
P�FgD�Y+0�,�쒶RKﴷ3ǔ�	�:�
+j����U�6R�]J5����/t$�3\�Ǹ�����Q�o�zN���+���e6���R�ߟ�;��e�;�g�.��L�An����?q~n#��TZ+
SE|
��QC
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/ca/e3f592f93656f6ec0a4a35e962378ef1e73c73 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/ca/e3f592f93656f6ec0a4a35e962378ef1e73c73
new file mode 100644
index 000000000..f1d44b096
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/ca/e3f592f93656f6ec0a4a35e962378ef1e73c73 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/d0/7a073b004dc256f9fc320d7e4a5af261dc948f b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/d0/7a073b004dc256f9fc320d7e4a5af261dc948f
new file mode 100644
index 000000000..51857c703
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/d0/7a073b004dc256f9fc320d7e4a5af261dc948f differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6
new file mode 100644
index 000000000..276616a2c
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/d6/7272451362a0e7ee68860c0f8113b6d85ec9e6
@@ -0,0 +1 @@
+x
mͽ�0@ag��n&�?R 17\|��\��Ps)��]����E\n"!2�/+S����)%v�!�І+�Tnj�0�K��������NO���qm��"!�܄0���U�
;&�����c�p���=&�W��[;ќw��.��N{hI��p�'s~�����F�
\ No newline at end of file
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/d8/dfabbe7f8147aa76edf40478eb857b28d84309 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/d8/dfabbe7f8147aa76edf40478eb857b28d84309
new file mode 100644
index 000000000..dcc9a060f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/d8/dfabbe7f8147aa76edf40478eb857b28d84309 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/e0/9f9e4f4048721a415fc3b706ca1e5c3a3b8076 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/e0/9f9e4f4048721a415fc3b706ca1e5c3a3b8076
new file mode 100644
index 000000000..92ad9e679
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/e0/9f9e4f4048721a415fc3b706ca1e5c3a3b8076 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e
new file mode 100644
index 000000000..5742c0fa8
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/e0/b478b8b91d606636ef31b2332ab16a66f0bc8e differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae
new file mode 100644
index 000000000..2abbac391
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/e9/d1b64d2b2e79b4429ea2181aa0efe43b7354ae differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/ee/f3bfa8f0b8eae0a58e90f34370f3fbe28b4179 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/ee/f3bfa8f0b8eae0a58e90f34370f3fbe28b4179
new file mode 100644
index 000000000..2ffbdb398
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/ee/f3bfa8f0b8eae0a58e90f34370f3fbe28b4179 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355 b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355
new file mode 100644
index 000000000..2ffcdf19f
Binary files /dev/null and b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/objects/f9/74a41e6c377b9a9ef5849baf476ef261e7f355 differ
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/adding_earth b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/adding_earth
new file mode 100644
index 000000000..0fa7fef85
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/adding_earth
@@ -0,0 +1 @@
+9375b3056bb3cfd8bc9024f59cfc16fc6659088b
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/adding_earth_merged b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/adding_earth_merged
new file mode 100644
index 000000000..8e67d87cc
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/adding_earth_merged
@@ -0,0 +1 @@
+42faf9a37ddd5b2e6c6f10c0abe9098ab7a3e0c7
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/adding_light b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/adding_light
new file mode 100644
index 000000000..2f75a8045
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/adding_light
@@ -0,0 +1 @@
+b4e5e469d975c0f9b9400e07b581bf8101cac76f
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/conflict_solved b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/conflict_solved
new file mode 100644
index 000000000..ae72b0015
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/conflict_solved
@@ -0,0 +1 @@
+5ff8beb34647b9e53970949cab95e4ccb86a9c72
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/merge_remote b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/merge_remote
new file mode 100644
index 000000000..c9b72bada
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/merge_remote
@@ -0,0 +1 @@
+2d833c4a0155a9b3d3cb7ecdeacbe3ee90c43d65
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/power_marker b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/power_marker
new file mode 100644
index 000000000..59be91879
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/power_marker
@@ -0,0 +1 @@
+31f7c8dd6d4973cef444c5573d8425a7d4e451bd
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/spell b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/spell
new file mode 100644
index 000000000..c9b72bada
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/spell
@@ -0,0 +1 @@
+2d833c4a0155a9b3d3cb7ecdeacbe3ee90c43d65
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/spell_init b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/spell_init
new file mode 100644
index 000000000..380840790
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/solution1_repo/refs/heads/spell_init
@@ -0,0 +1 @@
+7ae32bd02d811dc1782608525c0e2475811ebd83
diff --git a/missions/contrib/git_branching/00_prepare_bare_repo/static.sh b/missions/contrib/git_branching/00_prepare_bare_repo/static.sh
new file mode 100644
index 000000000..e1d1f1a59
--- /dev/null
+++ b/missions/contrib/git_branching/00_prepare_bare_repo/static.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+if ! git --version > /dev/null 2 > /dev/null
+then  echo "git not found"
+  return 1
+fi
+
+echo "#######################"
+mkdir -p $GSH_HOME/Castle/Portals/
+mkdir -p $GSH_HOME/Castle/Main_building/Library
+cp $MISSION_DIR/PortalBook $GSH_HOME/Castle/Main_building/Library/
+cp $MISSION_DIR/clean.sh $GSH_TMP
+cp $MISSION_DIR/clone.sh $GSH_TMP
+cp $MISSION_DIR/co.sh $GSH_TMP
+cp $MISSION_DIR/remove_marker_branch_repo.sh $GSH_TMP
+cp $MISSION_DIR/add_remote_minas_co.sh $GSH_TMP
+cp $MISSION_DIR/add_remote_myfork.sh $GSH_TMP
+cp $MISSION_DIR/add_remote_final_exo.sh $GSH_TMP
+cp $MISSION_DIR/merge_remote.sh $GSH_TMP
+
+
+cp -r $MISSION_DIR/solution1_repo $GSH_TMP
+cp -r $MISSION_DIR/minas_tirith_repo $GSH_TMP/minas_tirith
+cp -r $MISSION_DIR/cair_paravel_repo $GSH_TMP
+cp -r $MISSION_DIR/hogwarts_repo $GSH_TMP
+cp -r $MISSION_DIR/novigrad_repo $GSH_TMP
diff --git a/missions/contrib/git_branching/01_clone/_clean.sh b/missions/contrib/git_branching/01_clone/_clean.sh
new file mode 100644
index 000000000..670786c35
--- /dev/null
+++ b/missions/contrib/git_branching/01_clone/_clean.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
+<<<<<<< HEAD:missions/contrib/git_branching/01_clone/_clean.sh
+=======
+
+rm -rf $GSH_HOME/Castle/Portals/al_jeit
+>>>>>>> a71f653 (refactoring missions with new lore):missions/contrib/git_branching/05a_questions/clean.sh
diff --git a/missions/contrib/git_branching/01_clone/_test.sh b/missions/contrib/git_branching/01_clone/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/01_clone/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/01_clone/_treasure-msg.txt b/missions/contrib/git_branching/01_clone/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/01_clone/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/01_clone/_treasure.sh b/missions/contrib/git_branching/01_clone/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/01_clone/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/01_clone/auto.sh b/missions/contrib/git_branching/01_clone/auto.sh
new file mode 100644
index 000000000..f32f7efd3
--- /dev/null
+++ b/missions/contrib/git_branching/01_clone/auto.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+. $GSH_TMP/clone.sh
+cd ..
+gsh check
+
diff --git a/missions/contrib/git_branching/01_clone/check.sh b/missions/contrib/git_branching/01_clone/check.sh
new file mode 100644
index 000000000..00531ca71
--- /dev/null
+++ b/missions/contrib/git_branching/01_clone/check.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Portal room"
+      return 1
+  fi
+
+  al_far_repo=$goal/al_jeit
+  if [ ! -d "$al_far_repo" ]
+    then
+        echo "The Al Jeit portal does not seem to be present..."
+        return 1
+  fi
+
+  al_far_repo_git=$al_far_repo/.git
+  if [ ! -d "$al_far_repo_git" ]
+    then
+        echo "The Al Jeit portal looks like it is here but the magic is not operating..."
+        return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/01_clone/clean.sh b/missions/contrib/git_branching/01_clone/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/01_clone/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/01_clone/goal.txt b/missions/contrib/git_branching/01_clone/goal.txt
new file mode 100644
index 000000000..3926bce6d
--- /dev/null
+++ b/missions/contrib/git_branching/01_clone/goal.txt
@@ -0,0 +1,17 @@
+Mission goal
+============
+
+A dragon is approaching, you have to stop it or it will burn the castle and the whole region. You need an enchantment able to kill dragons.
+Wizards of Al Jeit castle were the first ones to work on such an enchantment.
+
+Go to the portal room and clone the portal of castle Al Jeit. We will figure out if it can be of any help.
+All adresses of castle portals are registered in the portal book in the library somewhere in the main tower.
+
+
+Useful commands
+===============
+
+To clone a repository
+git clone REPOSITORY_URL
+
+
diff --git a/missions/contrib/git_branching/01_clone/static.sh b/missions/contrib/git_branching/01_clone/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_branching/01_clone/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_branching/02_local_branch/_clean.sh b/missions/contrib/git_branching/02_local_branch/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/02_local_branch/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/02_local_branch/_test.sh b/missions/contrib/git_branching/02_local_branch/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/02_local_branch/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/02_local_branch/_treasure-msg.txt b/missions/contrib/git_branching/02_local_branch/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/02_local_branch/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/02_local_branch/_treasure.sh b/missions/contrib/git_branching/02_local_branch/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/02_local_branch/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/02_local_branch/auto.sh b/missions/contrib/git_branching/02_local_branch/auto.sh
new file mode 100644
index 000000000..c6ffd566d
--- /dev/null
+++ b/missions/contrib/git_branching/02_local_branch/auto.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/al_jeit
+git checkout adding_light
+git checkout adding_earth
+git checkout spell
+gsh check
diff --git a/missions/contrib/git_branching/02_local_branch/check.sh b/missions/contrib/git_branching/02_local_branch/check.sh
new file mode 100644
index 000000000..9539d8780
--- /dev/null
+++ b/missions/contrib/git_branching/02_local_branch/check.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+  expected_name="adding_earth"
+  branch_created=$(git branch | grep $expected_name)
+  if [ "$branch_created" = "" ]
+    then
+        echo "Improvement $expected_name is not available..."
+        return 1
+  fi
+
+  expected_name="adding_light"
+  branch_created=$(git branch | grep $expected_name)
+  if [ "$branch_created" = "" ]
+    then
+        echo "Improvement $expected_name is not available..."
+        return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/02_local_branch/clean.sh b/missions/contrib/git_branching/02_local_branch/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/02_local_branch/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/02_local_branch/goal.txt b/missions/contrib/git_branching/02_local_branch/goal.txt
new file mode 100644
index 000000000..6fc5593ac
--- /dev/null
+++ b/missions/contrib/git_branching/02_local_branch/goal.txt
@@ -0,0 +1,24 @@
+Mission goal
+============
+
+Now we have the Al Jeit portal, step into it so you can access the magic. 
+
+Look at all available improvements (branches) and create a local branch for each of them.
+
+
+Useful commands
+===============
+
+List available branches with
+git branch -a
+The "-a" option means "all" branches, i.e. branches that reflect the branches available on the remote repository on top of the local ones.
+
+The full syntax to create a local branch NEW_BRANCH_NAME that will be connected to the REMOTE_BRANCH_NAME on the remote repository REMOTE is
+git checkout -b NEW_BRANCH_NAME REMOTE/REMOTE_BRANCH_NAME
+This gives full flexibility on naming and can ensure no ambiguity in the command
+
+In simple case (like ours), i.e. when there is a single remote and no name collision between branches 
+git checkout REMOTE_BRANCH_NAME
+will create a local branch REMOTE_BRANCH_NAME, that will be connected to the remote one
+
+
diff --git a/missions/contrib/git_branching/02_local_branch/init.sh b/missions/contrib/git_branching/02_local_branch/init.sh
new file mode 100644
index 000000000..eddfccedf
--- /dev/null
+++ b/missions/contrib/git_branching/02_local_branch/init.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+    cd ..
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_branching/02_local_branch/static.sh b/missions/contrib/git_branching/02_local_branch/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_branching/02_local_branch/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_branching/02a_questions/_clean.sh b/missions/contrib/git_branching/02a_questions/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/02a_questions/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/02a_questions/_test.sh b/missions/contrib/git_branching/02a_questions/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/02a_questions/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/02a_questions/_treasure-msg.txt b/missions/contrib/git_branching/02a_questions/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/02a_questions/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/02a_questions/_treasure.sh b/missions/contrib/git_branching/02a_questions/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/02a_questions/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/02a_questions/auto.sh b/missions/contrib/git_branching/02a_questions/auto.sh
new file mode 100644
index 000000000..236bcd229
--- /dev/null
+++ b/missions/contrib/git_branching/02a_questions/auto.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+cd ..
+gsh skip
+
diff --git a/missions/contrib/git_branching/02a_questions/check.sh b/missions/contrib/git_branching/02a_questions/check.sh
new file mode 100644
index 000000000..08fa3dea3
--- /dev/null
+++ b/missions/contrib/git_branching/02a_questions/check.sh
@@ -0,0 +1,86 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+check_answer() {
+result=$1
+error_str=$2
+read -r response
+case "$response" in
+  "" | *[!0-9]*)
+    echo "That's not even a number!"
+    return 1
+    ;;
+  *)
+    if [ "$response" -ne $result ]
+    then
+      echo $error_str
+      return 1
+    fi
+    ;;
+esac
+}
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+
+echo "If we want to merge the adding_light branch into spell, which kind of merge it is ?"
+echo "1. a fast-forward merge"
+echo "2. a real merge"
+res="1"
+err_str="Too bad! The answer was $res. Indeed, it is a fast forward merge as there is a single direct link between the commit of the spell branch and the commit pointed by the adding_light branch"
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "If we want to merge the adding_earth branch into spell, which kind of merge it is ?"
+echo "1. a fast-forward merge"
+echo "2. a real merge"
+res="2"
+err_str="Too bad! The answer was $res. Indeed, it is a real merge because the history has diverged between the spell branch and adding_earth branch."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "What is the first ingredient of the spell on the spell branch (provide the number) ?"
+res="77"
+err_str="Too bad! The answer was $res."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "What is the first ingredient of the spell on the adding_light branch (provide the number) ?"
+res="77"
+err_str="Too bad! The answer was $res."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "What is the first ingredient of the spell on the adding_earth branch (provide the number) ?"
+res="44"
+err_str="Too bad! The answer was $res."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+  
+}
+_mission_check
diff --git a/missions/contrib/git_branching/02a_questions/clean.sh b/missions/contrib/git_branching/02a_questions/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/02a_questions/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/02a_questions/goal.txt b/missions/contrib/git_branching/02a_questions/goal.txt
new file mode 100644
index 000000000..b7715ce43
--- /dev/null
+++ b/missions/contrib/git_branching/02a_questions/goal.txt
@@ -0,0 +1,34 @@
+Mission goal
+============
+
+We will merge now those improvements (adding_light and adding_earth) and contribute also ourself to the enchantment. But one step after the other, let us inspect first the history and the content of each branch for the dragon_killer.spell.
+
+Look at the history of the enchantment:
+a. if we want to merge the adding_light branch into spell, which kind of merge it is ? a fast-forward merge ? or a real merge ?
+b. if we want to merge the adding_earth branch into spell, which kind of merge it is ? a fast-forward merge ? or a real merge ?
+
+Look at the the enchantment itself (content of file dragon_killer.spell) and its different versions on the different branches:
+c. What is the first ingredient of the enchantment on the spell branch
+d. What is the first ingredient of the enchantment on the adding_light branch
+e. What is the first ingredient of the enchantment on the adding_earth branch
+
+Look at the arcane book somewhere in the Library to learn about enchantment structure. 
+
+Start answering the question by typing `gsh check`. Ensure your HEAD is on the spell branch before.
+
+
+Useful commands
+===============
+
+To look at the history of a local repository putting one commit per line (--oneline), showing diverging and converging history (--graph) and all local branches even if they are not part of the history of the commit pointed by HEAD
+git log --oneline --graph --branches
+
+To put HEAD on a branch and update the working directory:
+git checkout BRANCH_NAME
+
+To display the content of a text file in the terminal
+cat FILE_NAME
+
+
+
+
diff --git a/missions/contrib/git_branching/02a_questions/init.sh b/missions/contrib/git_branching/02a_questions/init.sh
new file mode 100644
index 000000000..a1fa22e0a
--- /dev/null
+++ b/missions/contrib/git_branching/02a_questions/init.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    . $GSH_TMP/co.sh &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_branching/02a_questions/skip.txt b/missions/contrib/git_branching/02a_questions/skip.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/missions/contrib/git_branching/02a_questions/static.sh b/missions/contrib/git_branching/02a_questions/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_branching/02a_questions/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_branching/03_mergeFF/_clean.sh b/missions/contrib/git_branching/03_mergeFF/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/03_mergeFF/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/03_mergeFF/_test.sh b/missions/contrib/git_branching/03_mergeFF/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/03_mergeFF/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/03_mergeFF/_treasure-msg.txt b/missions/contrib/git_branching/03_mergeFF/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/03_mergeFF/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/03_mergeFF/_treasure.sh b/missions/contrib/git_branching/03_mergeFF/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/03_mergeFF/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/03_mergeFF/auto.sh b/missions/contrib/git_branching/03_mergeFF/auto.sh
new file mode 100644
index 000000000..71693ba8c
--- /dev/null
+++ b/missions/contrib/git_branching/03_mergeFF/auto.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+git merge adding_light 
+gsh check
+
diff --git a/missions/contrib/git_branching/03_mergeFF/check.sh b/missions/contrib/git_branching/03_mergeFF/check.sh
new file mode 100644
index 000000000..8466216d1
--- /dev/null
+++ b/missions/contrib/git_branching/03_mergeFF/check.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+  log=$(git branch --merged | grep "adding_light")
+  if [ "$log" = "" ]
+    then
+        echo "adding_light branch is not merged..."
+        return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/03_mergeFF/clean.sh b/missions/contrib/git_branching/03_mergeFF/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/03_mergeFF/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/03_mergeFF/goal.txt b/missions/contrib/git_branching/03_mergeFF/goal.txt
new file mode 100644
index 000000000..839f84e37
--- /dev/null
+++ b/missions/contrib/git_branching/03_mergeFF/goal.txt
@@ -0,0 +1,19 @@
+Mission goal
+============
+
+Look at the current content of the enchantment on the spell branch, realise the merge with the adding_light branch (ensure your HEAD is on the spell branch) and verify that the portal did modify the spell.
+
+
+Useful commands
+===============
+
+To look at the history of a local repository putting one commit per line (--oneline), showing diverging and converging history (--graph) and all local branches even if they are not part of the history of the commit pointed by HEAD
+git log --oneline --graph --branches
+
+
+To merge a branch. Ensure you are on the branch you want to merge into and then
+git merge BRANCH_NAME
+
+
+
+
diff --git a/missions/contrib/git_branching/03_mergeFF/init.sh b/missions/contrib/git_branching/03_mergeFF/init.sh
new file mode 100644
index 000000000..ec5d007d3
--- /dev/null
+++ b/missions/contrib/git_branching/03_mergeFF/init.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    . $GSH_TMP/co.sh &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_branching/03_mergeFF/static.sh b/missions/contrib/git_branching/03_mergeFF/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_branching/03_mergeFF/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_branching/03_mergeFF/treasure.sh b/missions/contrib/git_branching/03_mergeFF/treasure.sh
new file mode 100755
index 000000000..e8491fe9b
--- /dev/null
+++ b/missions/contrib/git_branching/03_mergeFF/treasure.sh
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+# === COULEURS ===
+RED='\033[0;31m'
+BLUE='\033[0;34m'
+YELLOW='\033[1;33m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+
+# === TERMINAL ===
+lines=$(tput lines)
+cols=$(tput cols)
+col_red=$((cols / 4))
+col_blue=$((cols / 2))
+col_yellow=$((3 * cols / 4))
+
+# === INITIALISER PV DRAGON ===
+PV_FILE="pv_dragon.txt"
+if [[ ! -f $PV_FILE ]]; then
+    echo 1000 > "$PV_FILE"
+fi
+
+# === FONCTION FLÈCHE VERS LE BAS ===
+lancer_fleche_verticale() {
+    local color=$1
+    local col=$2
+    local symbol="↓"
+
+    for ((i=0; i<lines-5; i++)); do
+        if (( i > 0 )); then
+            tput cup $((i-1)) $col
+            echo -ne " "
+        fi
+        tput cup $i $col
+        echo -ne "${color}${symbol}${NC}"
+        sleep 0.02
+    done
+
+    # Impact
+    tput cup $((lines-5)) $((col-1))
+    echo -e "${color}💥${NC}"
+
+    # Réduction de PV
+    if [[ -f "$PV_FILE" ]]; then
+        pv=$(<"$PV_FILE")
+        ((pv--))
+        echo "$pv" > "$PV_FILE"
+    fi
+}
+
+# === FONCTION AFFICHER BARRE DE VIE ===
+afficher_barre_vie() {
+    local pv=$(<"$PV_FILE")
+    local max=1000
+    local longueur=50
+    local remplissage=$((pv * longueur / max))
+    local barre=$(printf "%-${remplissage}s" "#" | tr ' ' '#')
+    local vide=$((longueur - remplissage))
+    local espaces=$(printf "%-${vide}s")
+
+    echo -ne "${GREEN}PV DRAGON: [${barre}${espaces}] $pv / $max${NC}\n"
+}
+
+# === NETTOYAGE ===
+clear
+
+# === LANCER FLÈCHES EN DÉCALÉ ===
+lancer_fleche_verticale "$RED" "$col_red" &
+sleep 0.5 
+lancer_fleche_verticale "$BLUE" "$col_blue" &
+sleep 0.5
+lancer_fleche_verticale "$YELLOW" "$col_yellow" &
+wait &> /dev/null
+
+sleep 1
+clear
+
+# === AFFICHAGE BARRE DE VIE ===
+#afficher_barre_vie
+#echo
+
+# === AFFICHER DRAGON MÉDIÉVAL ===
+echo -e "${YELLOW}"
+cat << "EOF"
+                          ___====-_  _-====___
+                    _--^^^#####//      \\#####^^^--_
+                 _-^##########// (    ) \\##########^-_
+                -############//  |\^^/|  \\############-
+              _/############//   (@::@)   \\############\_
+             /#############((     \\//     ))#############\
+            -###############\\    (oo)    //###############-
+           -#################\\  / UUU \  //#################-
+          -###################\\/  (_)  \//###################-
+         _#/|##########/\######(   "-"   )######/\##########|\#_
+         |/ |#/\#/\#/\/  \#/\##\  !   !  /##/\#/  \/\#/\#/\| \|
+         ||/  V  V '     V  \\#\  \___/  /#/  V     '  V  V  \||
+         ||| \ \|  |  |  |  |  |       |  |  |  |  |  |/ / / |||
+         |||  |_|_|_|_|_|_|_|_|_______|_|_|_|_|_|_|_|_|_|  |||
+EOF
+echo -e "${NC}"
+
+# === FIN ===
+echo -e "\n${RED}⚔️  It works ! You managed to launch an attack on the dragon but it just gave him a litlle scratch. Fight is not over...${NC}"
+
diff --git a/missions/contrib/git_branching/04_contrib/ArcaneBook b/missions/contrib/git_branching/04_contrib/ArcaneBook
new file mode 100644
index 000000000..b43db5a87
--- /dev/null
+++ b/missions/contrib/git_branching/04_contrib/ArcaneBook
@@ -0,0 +1,23 @@
+Different type of mana
+======================
+
+11 air
+22 fire
+33 water
+44 earth
+55 darkness
+66 light
+77 magma
+88 moisture
+99 poison
+111 truth
+222 lie
+
+Structure of a spell
+====================
+
+mana_fraction1 type_of_mana1
+mana_fraction2 type_of_mana2
+....
+
+The sum of mana_fraction* should be 100
diff --git a/missions/contrib/git_branching/04_contrib/_clean.sh b/missions/contrib/git_branching/04_contrib/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/04_contrib/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/04_contrib/_test.sh b/missions/contrib/git_branching/04_contrib/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/04_contrib/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/04_contrib/_treasure-msg.txt b/missions/contrib/git_branching/04_contrib/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/04_contrib/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/04_contrib/_treasure.sh b/missions/contrib/git_branching/04_contrib/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/04_contrib/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/04_contrib/auto.sh b/missions/contrib/git_branching/04_contrib/auto.sh
new file mode 100644
index 000000000..92264969f
--- /dev/null
+++ b/missions/contrib/git_branching/04_contrib/auto.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+git checkout -b power
+cp $MISSION_DIR/dragon_killer.spell .
+git commit -am "magma switched to fire !"
+gsh check
+
diff --git a/missions/contrib/git_branching/04_contrib/check.sh b/missions/contrib/git_branching/04_contrib/check.sh
new file mode 100644
index 000000000..2438f49a8
--- /dev/null
+++ b/missions/contrib/git_branching/04_contrib/check.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "power" ]
+    then
+        echo "You are not on the power branch..."
+        return 1
+  fi
+
+  ci_main=$(git branch -vv | grep main | tr -s ' ' | cut -d ' ' -f 3)
+  ci_power=$(git log --oneline -n 1 |cut -d ' ' -f 1)
+  if [ "$ci_main" = "$ci_power" ]
+    then
+        echo "main and power branches are pointing on the same commit, looks like there is no new contribution added to the portal..."
+        return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/04_contrib/clean.sh b/missions/contrib/git_branching/04_contrib/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/04_contrib/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/04_contrib/dragon_killer.spell b/missions/contrib/git_branching/04_contrib/dragon_killer.spell
new file mode 100644
index 000000000..61e8c49b4
--- /dev/null
+++ b/missions/contrib/git_branching/04_contrib/dragon_killer.spell
@@ -0,0 +1,4 @@
+30 22
+30 11
+20 111
+20 66
diff --git a/missions/contrib/git_branching/04_contrib/goal.txt b/missions/contrib/git_branching/04_contrib/goal.txt
new file mode 100644
index 000000000..b0f77c61c
--- /dev/null
+++ b/missions/contrib/git_branching/04_contrib/goal.txt
@@ -0,0 +1,28 @@
+Mission goal
+============
+
+Before merging the improvement of Merwyn with the usage of a new type of mana, the wizard of the castle gives you the advice to switch the magma mana to something more adequate: fire mana !
+
+You decide to implement this modification straight away before forgetting the advice. Look at the arcane book somewhere in the main tower to learn how to modify the spell. Then create a branch named power, checkout it, implement the modification and create a commit.
+
+
+Useful commands
+===============
+
+Use your favorite text editor (or gedit by default) to implement the required modification in the dragon_killer.spell
+
+To create a branch
+git branch BRANCH_NAME
+
+To put switch to a branch, i.e. to make your HEAD pointing at a branch
+git checkout BRANCH_NAME
+
+The two actions above of creating a branch and switching to it can be done in a single command
+git checkout -b BRANCH_NAME
+
+
+To create a commit please refer to previous mission if you forgot...
+
+
+
+
diff --git a/missions/contrib/git_branching/04_contrib/init.sh b/missions/contrib/git_branching/04_contrib/init.sh
new file mode 100644
index 000000000..90f584fe7
--- /dev/null
+++ b/missions/contrib/git_branching/04_contrib/init.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    . $GSH_TMP/co.sh &> /dev/null
+    git reset --hard adding_light &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+  fi
+
+}
+_mission_init
diff --git a/missions/contrib/git_branching/04_contrib/static.sh b/missions/contrib/git_branching/04_contrib/static.sh
new file mode 100644
index 000000000..85846e2b5
--- /dev/null
+++ b/missions/contrib/git_branching/04_contrib/static.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
+mkdir -p $GSH_HOME/Castle/Main_building/Library
+cp $MISSION_DIR/ArcaneBook $GSH_HOME/Castle/Main_building/Library
+
diff --git a/missions/contrib/git_branching/05_merge/_clean.sh b/missions/contrib/git_branching/05_merge/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/05_merge/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/05_merge/_test.sh b/missions/contrib/git_branching/05_merge/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/05_merge/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/05_merge/_treasure-msg.txt b/missions/contrib/git_branching/05_merge/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/05_merge/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/05_merge/_treasure.sh b/missions/contrib/git_branching/05_merge/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/05_merge/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/05_merge/auto.sh b/missions/contrib/git_branching/05_merge/auto.sh
new file mode 100644
index 000000000..5c5d1aa18
--- /dev/null
+++ b/missions/contrib/git_branching/05_merge/auto.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+git checkout spell
+git merge adding_earth --no-edit
+gsh check
+
diff --git a/missions/contrib/git_branching/05_merge/check.sh b/missions/contrib/git_branching/05_merge/check.sh
new file mode 100644
index 000000000..9efb04572
--- /dev/null
+++ b/missions/contrib/git_branching/05_merge/check.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+  log=$(git branch --merged | grep "adding_earth")
+  if [ "$log" = "" ]
+    then
+        echo "adding_earth branch is not merged..."
+        return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/05_merge/clean.sh b/missions/contrib/git_branching/05_merge/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/05_merge/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/05_merge/goal.txt b/missions/contrib/git_branching/05_merge/goal.txt
new file mode 100644
index 000000000..26623f6b3
--- /dev/null
+++ b/missions/contrib/git_branching/05_merge/goal.txt
@@ -0,0 +1,17 @@
+Mission goal
+============
+
+Now merge the adding_earth branch in the spell branch. Take care on the branch your are currently on, maybe you should switch !
+
+
+Useful commands
+===============
+
+To merge a branch. Ensure you are on the branch you want to merge into and then
+git merge BRANCH_NAME
+
+If you end up into a CONFLICT and would like to abort the current merge operation
+git merge --abort
+
+To change your HEAD on a branch and update the working directory
+git checkout BRANCH_NAME
diff --git a/missions/contrib/git_branching/05_merge/init.sh b/missions/contrib/git_branching/05_merge/init.sh
new file mode 100644
index 000000000..6fd11e69a
--- /dev/null
+++ b/missions/contrib/git_branching/05_merge/init.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null 
+    . $GSH_TMP/co.sh &> /dev/null
+    git reset --hard adding_light &> /dev/null
+    git checkout -b power origin/power_marker &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_branching/05_merge/static.sh b/missions/contrib/git_branching/05_merge/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_branching/05_merge/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_branching/05_merge/treasure.sh b/missions/contrib/git_branching/05_merge/treasure.sh
new file mode 100755
index 000000000..2c38361b9
--- /dev/null
+++ b/missions/contrib/git_branching/05_merge/treasure.sh
@@ -0,0 +1,141 @@
+#!/bin/bash
+
+# === COULEURS ANSI ===
+RED='\033[0;31m'
+BLUE='\033[0;34m'
+YELLOW='\033[1;33m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+
+# === TERMINAL ===
+lines=$(tput lines)
+cols=$(tput cols)
+col_red=$((cols / 4))
+col_blue=$((cols / 2))
+col_yellow=$((3 * cols / 4))
+
+# === INITIALISER PV DRAGON ===
+PV_FILE="pv_dragon.txt"
+if [[ ! -f $PV_FILE ]]; then
+    echo 1000 > "$PV_FILE"
+fi
+
+# === EXPLOSION ANIMÉE ===
+explosion_ascii() {
+    local row=$1
+    local col=$2
+    local colors=('\033[0;31m' '\033[0;34m' '\033[1;33m' '\033[0;35m' '\033[1;32m')
+    local symbols=("*" "+" "x" "X" "o" "@")
+
+    for frame in {1..5}; do
+        tput cup $((row - 1)) $col
+        echo -ne "${colors[frame % ${#colors[@]}]}${symbols[frame % ${#symbols[@]}]}${NC}"
+
+        tput cup $((row + 1)) $col
+        echo -ne "${colors[(frame+1) % ${#colors[@]}]}${symbols[(frame+1) % ${#symbols[@]}]}${NC}"
+
+        tput cup $row $((col - 1))
+        echo -ne "${colors[(frame+2) % ${#colors[@]}]}${symbols[(frame+2) % ${#symbols[@]}]}${NC}"
+
+        tput cup $row $((col + 1))
+        echo -ne "${colors[(frame+3) % ${#colors[@]}]}${symbols[(frame+3) % ${#symbols[@]}]}${NC}"
+
+        tput cup $row $col
+        echo -ne "${colors[(frame+4) % ${#colors[@]}]}*${NC}"
+
+        sleep 0.1
+
+        # Effacer
+        tput cup $((row - 1)) $col; echo -ne " "
+        tput cup $((row + 1)) $col; echo -ne " "
+        tput cup $row $((col - 1)); echo -ne " "
+        tput cup $row $((col + 1)); echo -ne " "
+        tput cup $row $col; echo -ne " "
+    done
+}
+
+# === FLÈCHE VERS LE BAS + EXPLOSION ===
+lancer_fleche_verticale() {
+    local color=$1
+    local col=$2
+    local symbol="↓"
+
+    for ((i=0; i<lines-5; i++)); do
+        if (( i > 0 )); then
+            tput cup $((i-1)) $col
+            echo -ne " "
+        fi
+        tput cup $i $col
+        echo -ne "${color}${symbol}${NC}"
+        sleep 0.02
+    done
+
+    local impact_row=$((lines - 5))
+    explosion_ascii "$impact_row" "$col"
+
+    # Réduction de PV
+    if [[ -f "$PV_FILE" ]]; then
+        pv=$(<"$PV_FILE")
+        ((pv--))
+	((pv--))
+	((pv--))
+	((pv--))
+        ((pv--))
+        echo "$pv" > "$PV_FILE"
+    fi
+}
+
+# === AFFICHAGE BARRE DE VIE ===
+afficher_barre_vie() {
+    local pv=$(<"$PV_FILE")
+    local max=1000
+    local longueur=50
+    local remplissage=$((pv * longueur / max))
+    local barre=$(printf "%-${remplissage}s" "#" | tr ' ' '#')
+    local vide=$((longueur - remplissage))
+    local espaces=$(printf "%-${vide}s")
+
+    echo -ne "${GREEN}PV DRAGON: [${barre}${espaces}] $pv / $max${NC}\n"
+}
+
+# === NETTOYAGE ===
+clear
+
+# === LANCER LES FLÈCHES EXPLOSIVES ===
+lancer_fleche_verticale "$RED" "$col_red" &
+sleep 1
+lancer_fleche_verticale "$BLUE" "$col_blue" &
+sleep 1
+lancer_fleche_verticale "$YELLOW" "$col_yellow" &
+wait &> /dev/null
+
+sleep 1
+clear
+
+# === AFFICHAGE BARRE DE VIE ===
+#afficher_barre_vie
+#echo
+
+# === DRAGON MÉDIÉVAL ASCII ===
+echo -e "${YELLOW}"
+cat << "EOF"
+                          ___====-_  _-====___
+                    _--^^^#####//      \\#####^^^--_
+                 _-^##########// (    ) \\##########^-_
+                -############//  |\^^/|  \\############-
+              _/############//   (@::@)   \\############\_
+             /#############((     \\//     ))#############\
+            -###############\\    (oo)    //###############-
+           -#################\\  / UUU \  //#################-
+          -###################\\/  (_)  \//###################-
+         _#/|##########/\######(   "-"   )######/\##########|\#_
+         |/ |#/\#/\#/\/  \#/\##\  !   !  /##/\#/  \/\#/\#/\| \|
+         ||/  V  V '     V  \\#\  \___/  /#/  V     '  V  V  \||
+         ||| \ \|  |  |  |  |  |       |  |  |  |  |  |/ / / |||
+         |||  |_|_|_|_|_|_|_|_|_______|_|_|_|_|_|_|_|_|_|  |||
+EOF
+echo -e "${NC}"
+
+# === FIN ===
+echo -e "\n${RED}⚔️  The enchantment is a bit stronger but still not enough. Fight is not over...${NC}"
+
diff --git a/missions/contrib/git_branching/05a_questions/_clean.sh b/missions/contrib/git_branching/05a_questions/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/05a_questions/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/05a_questions/_test.sh b/missions/contrib/git_branching/05a_questions/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/05a_questions/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/05a_questions/_treasure-msg.txt b/missions/contrib/git_branching/05a_questions/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/05a_questions/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/05a_questions/_treasure.sh b/missions/contrib/git_branching/05a_questions/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/05a_questions/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/05a_questions/auto.sh b/missions/contrib/git_branching/05a_questions/auto.sh
new file mode 100644
index 000000000..5a8c3e4f1
--- /dev/null
+++ b/missions/contrib/git_branching/05a_questions/auto.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+gsh skip
+
diff --git a/missions/contrib/git_branching/05a_questions/check.sh b/missions/contrib/git_branching/05a_questions/check.sh
new file mode 100644
index 000000000..53f045c7b
--- /dev/null
+++ b/missions/contrib/git_branching/05a_questions/check.sh
@@ -0,0 +1,85 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+check_answer() {
+result=$1
+error_str=$2
+read -r response
+case "$response" in
+  "" | *[!0-9]*)
+    echo "That's not even a number!"
+    return 1
+    ;;
+  *)
+    if [ "$response" -ne $result ]
+    then
+      echo $error_str
+      return 1
+    fi
+    ;;
+esac
+}
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+echo "If we want to merge the power branch into spell, which kind of merge it is ?"
+echo "1. a fast-forward merge"
+echo "2. a real merge"
+res="2"
+err_str="Too bad! The answer was $res. Indeed, it is a real merge because the history has diverged between the spell branch and power branch."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "What is the first ingredient of the spell on the spell branch (provide the number) ?"
+res="44"
+err_str="Too bad! The answer was $res."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "What is the first ingredient of the spell on the power branch (provide the number) ?"
+res="22"
+err_str="Too bad! The answer was $res."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "What is the first ingredient of the spell on the most recent common ancestor of spell and power branches (provide the number) ?"
+res="77"
+err_str="Too bad! The answer was $res."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "In this context, if we merge the power branch, will there be a conflict ?"
+echo "1. yes"
+echo "2. no"
+res="1"
+err_str="Too bad! The answer was $res. Indeed, the ingredient of the spell has changed on both power and spell branches compared to their most recent ancestor (33,66 vs 11). And those two values are different, git cannot decide which one is the correct one to merge."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/05a_questions/clean.sh b/missions/contrib/git_branching/05a_questions/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/05a_questions/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/05a_questions/goal.txt b/missions/contrib/git_branching/05a_questions/goal.txt
new file mode 100644
index 000000000..a42e1ae67
--- /dev/null
+++ b/missions/contrib/git_branching/05a_questions/goal.txt
@@ -0,0 +1,38 @@
+Mission goal
+============
+
+Before merging the last branch, let us inspect again the local repository.
+
+Look at the history of the spell:
+a. if we want to merge the power branch into spell, which kind of merge it is ? a fast-forward merge ? or a real merge ?
+
+Look at the the spell version on the different branches. What is the first ingredient of the spell
+b. on the spell branch ?
+c. on the power branch ?
+d. on the most recent common ancestor of spell and power branches ?
+e. In this context, if we merge the power branch into the spell branch, will there be a conflict ?
+
+Ensure you are on the spell branch before answering the questions.
+
+
+Useful commands
+===============
+
+To look at the history of a local repository putting one commit per line (--oneline), showing diverging and converging history (--graph) and showing all branches (--branches)
+git log --oneline --graph --branches
+
+To display the content of a text file in the terminal
+cat FILE_NAME
+
+To put HEAD on anywhere in the repository and update the working directory:
+git checkout REF_LOG
+REF_LOG can be:
+- a branch name
+- any commit referenced by its id, for instance 30c900f
+- any commit being an ancestor of a branch or HEAD, for instance HEAD^ references the immediate ancestor of HEAD, add_rune^^ references tha ancestor of the ancestor of the commit pointed by add_rune.
+
+
+What is a conflict ?
+A conflict occurs when git is asked to merge two commits where the same line of the same file is modified in both commits compared to their most recent common ancestor.
+
+
diff --git a/missions/contrib/git_branching/05a_questions/init.sh b/missions/contrib/git_branching/05a_questions/init.sh
new file mode 100644
index 000000000..17aea112e
--- /dev/null
+++ b/missions/contrib/git_branching/05a_questions/init.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    . $GSH_TMP/co.sh &> /dev/null
+    git reset --hard origin/adding_earth_merged &> /dev/null
+    git branch power origin/power_marker &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+    git co power
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_branching/05a_questions/skip.txt b/missions/contrib/git_branching/05a_questions/skip.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/missions/contrib/git_branching/05a_questions/static.sh b/missions/contrib/git_branching/05a_questions/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_branching/05a_questions/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_branching/06_merge_conflict/_clean.sh b/missions/contrib/git_branching/06_merge_conflict/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/06_merge_conflict/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/06_merge_conflict/_test.sh b/missions/contrib/git_branching/06_merge_conflict/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/06_merge_conflict/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/06_merge_conflict/_treasure-msg.txt b/missions/contrib/git_branching/06_merge_conflict/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/06_merge_conflict/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/06_merge_conflict/_treasure.sh b/missions/contrib/git_branching/06_merge_conflict/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/06_merge_conflict/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/06_merge_conflict/auto.sh b/missions/contrib/git_branching/06_merge_conflict/auto.sh
new file mode 100644
index 000000000..260fe6692
--- /dev/null
+++ b/missions/contrib/git_branching/06_merge_conflict/auto.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+git merge power
+cp $MISSION_DIR/dragon_killer.spell .
+git add dragon_killer.spell
+git commit -m "conflict solved, fire kept"
+gsh check
+
diff --git a/missions/contrib/git_branching/06_merge_conflict/check.sh b/missions/contrib/git_branching/06_merge_conflict/check.sh
new file mode 100644
index 000000000..34cbe2750
--- /dev/null
+++ b/missions/contrib/git_branching/06_merge_conflict/check.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+  log=$(git branch --merged | grep "power")
+  if [ "$log" = "" ]
+    then
+        echo "power branch is not merged..."
+        return 1
+  fi
+
+  diff_res=$(diff dragon_killer.spell $MISSION_DIR/dragon_killer.spell)
+  if [ "$log" = "" ]
+    then
+        echo "The spell does not like expected, you may have solved the conflict the wrong way..."
+        return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/06_merge_conflict/clean.sh b/missions/contrib/git_branching/06_merge_conflict/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/06_merge_conflict/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/06_merge_conflict/dragon_killer.spell b/missions/contrib/git_branching/06_merge_conflict/dragon_killer.spell
new file mode 100644
index 000000000..61e8c49b4
--- /dev/null
+++ b/missions/contrib/git_branching/06_merge_conflict/dragon_killer.spell
@@ -0,0 +1,4 @@
+30 22
+30 11
+20 111
+20 66
diff --git a/missions/contrib/git_branching/06_merge_conflict/goal.txt b/missions/contrib/git_branching/06_merge_conflict/goal.txt
new file mode 100644
index 000000000..f1c44e8b6
--- /dev/null
+++ b/missions/contrib/git_branching/06_merge_conflict/goal.txt
@@ -0,0 +1,41 @@
+Mission goal
+============
+
+Last but not least, merge the contribution you made on branch power. You might end-up in a conflict. 
+
+Ensure you keep your version with the fire mana.
+
+
+Useful commands
+===============
+
+To merge a branch. Ensure you are on the branch you want to merge into and then
+git merge BRANCH_NAME
+
+If you end up into a CONFLICT and would like to abort the current merge operation
+git merge --abort
+
+## What is a conflict ?
+A conflict occurs when git is asked to merge two commits where the same line of the same file is modified in both commits.
+In our case, the spell on the power branch has its first line modified and spell on the main branch has also its first line modified.
+
+When a conflict occurs, git modifies the file in the working directoy like this:
+     <<<<<<< HEAD
+     30 44
+     =======
+     30 22
+     >>>>>>> power
+
+Between the <<< and the === the version of the branch pointed by HEAD, so in our case the main branch
+Between the === and the >>> the version of power branch
+Git cannot decide which one is the right one, you have to decide if the first version has be kept, the second, a mix of both, yet a third version... 
+
+## How to fix a conflict ?
+
+-   Replace everything between the <<< and the >>> by the correct version
+-   git add FILE_NAME
+-   git commit
+-   Automatic commit message indicating conflict resolution
+
+
+
diff --git a/missions/contrib/git_branching/06_merge_conflict/init.sh b/missions/contrib/git_branching/06_merge_conflict/init.sh
new file mode 100644
index 000000000..59d0c7892
--- /dev/null
+++ b/missions/contrib/git_branching/06_merge_conflict/init.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null 
+    . $GSH_TMP/co.sh &> /dev/null
+    git reset --hard origin/adding_earth_merged &> /dev/null
+    git branch power origin/power_marker &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+  fi
+
+}
+_mission_init
diff --git a/missions/contrib/git_branching/06_merge_conflict/static.sh b/missions/contrib/git_branching/06_merge_conflict/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_branching/06_merge_conflict/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_branching/06_merge_conflict/treasure.sh b/missions/contrib/git_branching/06_merge_conflict/treasure.sh
new file mode 100755
index 000000000..df0e6b773
--- /dev/null
+++ b/missions/contrib/git_branching/06_merge_conflict/treasure.sh
@@ -0,0 +1,137 @@
+#!/bin/bash
+
+# === COULEURS ANSI ===
+RED='\033[0;31m'
+BLUE='\033[0;34m'
+YELLOW='\033[1;33m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+
+# === TERMINAL ===
+lines=$(tput lines)
+cols=$(tput cols)
+col_red=$((cols / 4))
+col_blue=$((cols / 2))
+col_yellow=$((3 * cols / 4))
+
+# === INITIALISER PV DRAGON ===
+PV_FILE="pv_dragon.txt"
+if [[ ! -f $PV_FILE ]]; then
+    echo 1000 > "$PV_FILE"
+fi
+
+# === EXPLOSION ANIMÉE ===
+explosion_ascii() {
+    local row=$1
+    local col=$2
+    local colors=('\033[0;31m' '\033[0;34m' '\033[1;33m' '\033[0;35m' '\033[1;32m')
+    local symbols=("*" "+" "x" "X" "o" "@")
+
+    for frame in {1..7}; do
+        # Positions autour du centre (5x5)
+        for dr in {-2..2}; do
+            for dc in {-2..2}; do
+                local r=$((row + dr))
+                local c=$((col + dc))
+                # Calculer couleur et symbole selon frame et position
+                local color_index=$(((frame + dr + dc) % ${#colors[@]}))
+                local symbol_index=$(((frame + dr + dc) % ${#symbols[@]}))
+                tput cup $r $c
+                echo -ne "${colors[color_index]}${symbols[symbol_index]}${NC}"
+            done
+        done
+        sleep 0.12
+
+        # Effacer zone 5x5
+        for dr in {-2..2}; do
+            for dc in {-2..2}; do
+                local r=$((row + dr))
+                local c=$((col + dc))
+                tput cup $r $c
+                echo -ne " "
+            done
+        done
+    done
+}
+
+# === FLÈCHE VERS LE BAS + EXPLOSION ===
+lancer_fleche_verticale() {
+    local color=$1
+    local col=$2
+    local symbol="↓"
+
+    for ((i=0; i<lines-5; i++)); do
+        if (( i > 0 )); then
+            tput cup $((i-1)) $col
+            echo -ne " "
+        fi
+        tput cup $i $col
+        echo -ne "${color}${symbol}${NC}"
+        sleep 0.02
+    done
+
+    local impact_row=$((lines - 5))
+    explosion_ascii "$impact_row" "$col"
+    dammage=20
+    # Réduction de PV
+    if [[ -f "$PV_FILE" ]]; then
+        pv=$(<"$PV_FILE")
+	pv=$((pv - dammage))
+        echo "$pv" > "$PV_FILE"
+    fi
+}
+
+# === AFFICHAGE BARRE DE VIE ===
+afficher_barre_vie() {
+    local pv=$(<"$PV_FILE")
+    local max=1000
+    local longueur=50
+    local remplissage=$((pv * longueur / max))
+    local barre=$(printf "%-${remplissage}s" "#" | tr ' ' '#')
+    local vide=$((longueur - remplissage))
+    local espaces=$(printf "%-${vide}s")
+
+    echo -ne "${GREEN}PV DRAGON: [${barre}${espaces}] $pv / $max${NC}\n"
+}
+
+# === NETTOYAGE ===
+clear
+
+# === LANCER LES FLÈCHES EXPLOSIVES ===
+lancer_fleche_verticale "$RED" "$col_red" &
+sleep 1
+lancer_fleche_verticale "$BLUE" "$col_blue" &
+sleep 1
+lancer_fleche_verticale "$YELLOW" "$col_yellow" &
+wait &> /dev/null
+
+sleep 1
+clear
+
+# === AFFICHAGE BARRE DE VIE ===
+#afficher_barre_vie
+#echo
+
+# === DRAGON MÉDIÉVAL ASCII ===
+echo -e "${YELLOW}"
+cat << "EOF"
+                          ___====-_  _-====___
+                    _--^^^#####//      \\#####^^^--_
+                 _-^##########// (    ) \\##########^-_
+                -############//  |\^^/|  \\############-
+              _/############//   (@::@)   \\############\_
+             /#############((     \\//     ))#############\
+            -###############\\    (oo)    //###############-
+           -#################\\  / UUU \  //#################-
+          -###################\\/  (_)  \//###################-
+         _#/|##########/\######(   "-"   )######/\##########|\#_
+         |/ |#/\#/\#/\/  \#/\##\  !   !  /##/\#/  \/\#/\#/\| \|
+         ||/  V  V '     V  \\#\  \___/  /#/  V     '  V  V  \||
+         ||| \ \|  |  |  |  |  |       |  |  |  |  |  |/ / / |||
+         |||  |_|_|_|_|_|_|_|_|_______|_|_|_|_|_|_|_|_|_|  |||
+EOF
+echo -e "${NC}"
+
+# === FIN ===
+echo -e "\n${RED}⚔️  Enchantment is already much stronger but it is not enough. Fight is not over...${NC}"
+
diff --git a/missions/contrib/git_branching/07_delete_branch/_clean.sh b/missions/contrib/git_branching/07_delete_branch/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/07_delete_branch/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/07_delete_branch/_test.sh b/missions/contrib/git_branching/07_delete_branch/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/07_delete_branch/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/07_delete_branch/_treasure-msg.txt b/missions/contrib/git_branching/07_delete_branch/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/07_delete_branch/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/07_delete_branch/_treasure.sh b/missions/contrib/git_branching/07_delete_branch/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/07_delete_branch/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/07_delete_branch/auto.sh b/missions/contrib/git_branching/07_delete_branch/auto.sh
new file mode 100644
index 000000000..85903f026
--- /dev/null
+++ b/missions/contrib/git_branching/07_delete_branch/auto.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+git branch -d power adding_earth adding_light
+gsh check
+
diff --git a/missions/contrib/git_branching/07_delete_branch/check.sh b/missions/contrib/git_branching/07_delete_branch/check.sh
new file mode 100644
index 000000000..1774f28ad
--- /dev/null
+++ b/missions/contrib/git_branching/07_delete_branch/check.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+  log=$(git branch --merged | grep "power")
+  if [ "$log" != "" ]
+    then
+        echo "power branch is still here..."
+        return 1
+  fi
+
+  log=$(git branch --merged | grep "adding_earth")
+  if [ "$log" != "" ]
+    then
+        echo "adding_earth branch is still here..."
+        return 1
+  fi
+
+  log=$(git branch --merged | grep "adding_light")
+  if [ "$log" != "" ]
+    then
+        echo "adding_light branch is still here..."
+        return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/07_delete_branch/clean.sh b/missions/contrib/git_branching/07_delete_branch/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/07_delete_branch/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/07_delete_branch/goal.txt b/missions/contrib/git_branching/07_delete_branch/goal.txt
new file mode 100644
index 000000000..87412d5c4
--- /dev/null
+++ b/missions/contrib/git_branching/07_delete_branch/goal.txt
@@ -0,0 +1,15 @@
+Mission goal
+============
+
+Now everything is merged, let us clean the repository and remove all the branches we do need anymore.
+
+Useful commands
+===============
+
+To delete a branch that has been merged (our case). 
+git branch -d BRANCH_NAME
+You will need to use -D instead of -d for a non merged branch. As deleting such a branch might lead to hide some commits in the history, this gives a little bt of security
+
+
+
+
diff --git a/missions/contrib/git_branching/07_delete_branch/init.sh b/missions/contrib/git_branching/07_delete_branch/init.sh
new file mode 100644
index 000000000..f6a51704a
--- /dev/null
+++ b/missions/contrib/git_branching/07_delete_branch/init.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null 
+    . $GSH_TMP/co.sh &> /dev/null
+    git reset --hard origin/conflict_solved &> /dev/null
+    git branch power origin/power_marker &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+  fi
+}
+_mission_init
diff --git a/missions/contrib/git_branching/07_delete_branch/static.sh b/missions/contrib/git_branching/07_delete_branch/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_branching/07_delete_branch/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_branching/08_add_remote/PortalBook b/missions/contrib/git_branching/08_add_remote/PortalBook
new file mode 100644
index 000000000..2076c0159
--- /dev/null
+++ b/missions/contrib/git_branching/08_add_remote/PortalBook
@@ -0,0 +1,2 @@
+Al Jeit: https://git.univ-pau.fr/gameshell_git/al_jeit.git
+Minas Tirith: https://git.univ-pau.fr/gameshell_git/minas_tirith.git
diff --git a/missions/contrib/git_branching/08_add_remote/PortalBook_pau b/missions/contrib/git_branching/08_add_remote/PortalBook_pau
new file mode 100644
index 000000000..2076c0159
--- /dev/null
+++ b/missions/contrib/git_branching/08_add_remote/PortalBook_pau
@@ -0,0 +1,2 @@
+Al Jeit: https://git.univ-pau.fr/gameshell_git/al_jeit.git
+Minas Tirith: https://git.univ-pau.fr/gameshell_git/minas_tirith.git
diff --git a/missions/contrib/git_branching/08_add_remote/PortalBook_plm b/missions/contrib/git_branching/08_add_remote/PortalBook_plm
new file mode 100644
index 000000000..81faafaa1
--- /dev/null
+++ b/missions/contrib/git_branching/08_add_remote/PortalBook_plm
@@ -0,0 +1,2 @@
+Al Jeit: https://plmlab.math.cnrs.fr/gameshell_git/al_jeit.git
+Minas Tirith: https://plmlab.math.cnrs.fr/gameshell_git/minas_tirith.git
diff --git a/missions/contrib/git_branching/08_add_remote/_clean.sh b/missions/contrib/git_branching/08_add_remote/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/08_add_remote/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/08_add_remote/_test.sh b/missions/contrib/git_branching/08_add_remote/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/08_add_remote/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/08_add_remote/_treasure-msg.txt b/missions/contrib/git_branching/08_add_remote/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/08_add_remote/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/08_add_remote/_treasure.sh b/missions/contrib/git_branching/08_add_remote/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/08_add_remote/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/08_add_remote/auto.sh b/missions/contrib/git_branching/08_add_remote/auto.sh
new file mode 100644
index 000000000..f44c4b6bc
--- /dev/null
+++ b/missions/contrib/git_branching/08_add_remote/auto.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+. $GSH_TMP/add_remote_minas_co.sh
+gsh check
+
diff --git a/missions/contrib/git_branching/08_add_remote/check.sh b/missions/contrib/git_branching/08_add_remote/check.sh
new file mode 100644
index 000000000..33f9dcdcc
--- /dev/null
+++ b/missions/contrib/git_branching/08_add_remote/check.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(LANG=GB git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+  expected_name="adding_moisture"
+  branch_created=$(LANG=GB git branch | grep $expected_name)
+  if [ "$branch_created" = "" ]
+    then
+        echo "Improvement $expected_name is not available..."
+        return 1
+  fi
+
+  expected_name="switching_magma_earth"
+  branch_created=$(LANG=GB git branch | grep $expected_name)
+  if [ "$branch_created" = "" ]
+    then
+        echo "Improvement $expected_name is not available..."
+        return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/08_add_remote/clean.sh b/missions/contrib/git_branching/08_add_remote/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/08_add_remote/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/08_add_remote/goal.txt b/missions/contrib/git_branching/08_add_remote/goal.txt
new file mode 100644
index 000000000..dbef6f213
--- /dev/null
+++ b/missions/contrib/git_branching/08_add_remote/goal.txt
@@ -0,0 +1,30 @@
+Mission goal
+============
+
+You did the maximum with all spell pieces that were around in the Al Jeit portal, but it is not enough. The dragon is still living and threating the castle and the whole region. You will not see sunset tonight.
+
+In this moment of profound despair, an old wizard came to you. With her scrumbling voice, she said: "I am Duom Erg from Al Jeit. When I was there I could access to some secrets of the magic council. The price to pay to access those secrets is my life if I reveal them. As we are all about to die, it is time to reveal some, maybe it might save all others. Make good use of it, I trust you."
+
+The wizard disapeared in a bright light and the Library suffered something like an earthquake. The librarian came to you still under shock, his hands were shaking. He managed to say: "The book... The PortalBook has shaken, it has triggered this earthquake !"
+
+There is no time to loose, look at the portal book if there is a new portal referenced in it. Add this portal as a new remote, fetch it and create local branches for each remote branch.
+
+
+
+Useful commands
+===============
+
+Add a remote to your local repository
+git remote add REMOTE_NAME REPOSITORY_URL
+
+Fetch commits from a remote and update the local repository
+git fetch REMOTE_NAME
+
+List available branches with
+git branch -a
+The "-a" option means "all" branches, i.e. branches that reflect the branches available on the remote repository on top of the local ones.
+
+In simple case (like ours), i.e. when there is a single remote and no name collision between branches 
+git checkout REMOTE_BRANCH_NAME
+will create a local branch REMOTE_BRANCH_NAME, that will be connected to the remote one
+
diff --git a/missions/contrib/git_branching/08_add_remote/init.sh b/missions/contrib/git_branching/08_add_remote/init.sh
new file mode 100644
index 000000000..4e762c9df
--- /dev/null
+++ b/missions/contrib/git_branching/08_add_remote/init.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    cp $MISSION_DIR/PortalBook $GSH_HOME/Castle/Main_building/Library/
+    . $GSH_TMP/clone.sh &> /dev/null 
+    git reset --hard origin/conflict_solved &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_branching/08_add_remote/static.sh b/missions/contrib/git_branching/08_add_remote/static.sh
new file mode 100644
index 000000000..5fa3f6d00
--- /dev/null
+++ b/missions/contrib/git_branching/08_add_remote/static.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
+mkdir -p $GSH_HOME/Castle/Main_building/Library
diff --git a/missions/contrib/git_branching/09_merge_remote/PortalBook b/missions/contrib/git_branching/09_merge_remote/PortalBook
new file mode 120000
index 000000000..25996d390
--- /dev/null
+++ b/missions/contrib/git_branching/09_merge_remote/PortalBook
@@ -0,0 +1 @@
+../08_add_remote/PortalBook
\ No newline at end of file
diff --git a/missions/contrib/git_branching/09_merge_remote/_clean.sh b/missions/contrib/git_branching/09_merge_remote/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/09_merge_remote/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/09_merge_remote/_test.sh b/missions/contrib/git_branching/09_merge_remote/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/09_merge_remote/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/09_merge_remote/_treasure-msg.txt b/missions/contrib/git_branching/09_merge_remote/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/09_merge_remote/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/09_merge_remote/amplification.spell b/missions/contrib/git_branching/09_merge_remote/amplification.spell
new file mode 100644
index 000000000..71fb04989
--- /dev/null
+++ b/missions/contrib/git_branching/09_merge_remote/amplification.spell
@@ -0,0 +1,5 @@
+30 44
+30 11
+30 111
+5  55
+5  88
diff --git a/missions/contrib/git_branching/09_merge_remote/auto.sh b/missions/contrib/git_branching/09_merge_remote/auto.sh
new file mode 100644
index 000000000..467c8fa8a
--- /dev/null
+++ b/missions/contrib/git_branching/09_merge_remote/auto.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+git checkout -b ampli minas/spell
+git merge switching_magma_earth
+git merge adding_moisture
+git checkout spell
+git merge ampli
+
+gsh check
+
diff --git a/missions/contrib/git_branching/09_merge_remote/check.sh b/missions/contrib/git_branching/09_merge_remote/check.sh
new file mode 100644
index 000000000..6ccb4230c
--- /dev/null
+++ b/missions/contrib/git_branching/09_merge_remote/check.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(LANG=GB git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+  branch=adding_moisture
+  log=$(LANG=GB git branch --merged | grep $branch)
+  if [ "$log" = "" ]
+    then
+        echo "$branch branch is not merged..."
+        return 1
+  fi
+
+  branch=switching_magma_earth
+  log=$(LANG=GB git branch --merged | grep $branch)
+  if [ "$log" = "" ]
+    then
+        echo "$branch branch is not merged..."
+        return 1
+  fi
+
+  for spell in dragon_killer.spell amplification.spell
+  do
+    diff=$(diff $spell $MISSION_DIR/$spell)
+    if [ "$diff" != "" ]
+    then
+      echo "The final $spell is not correct. It should look like this:"
+      cat $MISSION_DIR/$spell
+      return 1
+    fi
+  done
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/09_merge_remote/clean.sh b/missions/contrib/git_branching/09_merge_remote/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/09_merge_remote/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/09_merge_remote/dragon_killer.spell b/missions/contrib/git_branching/09_merge_remote/dragon_killer.spell
new file mode 120000
index 000000000..0dbb7eef4
--- /dev/null
+++ b/missions/contrib/git_branching/09_merge_remote/dragon_killer.spell
@@ -0,0 +1 @@
+../06_merge_conflict/dragon_killer.spell
\ No newline at end of file
diff --git a/missions/contrib/git_branching/09_merge_remote/goal.txt b/missions/contrib/git_branching/09_merge_remote/goal.txt
new file mode 100644
index 000000000..36af60356
--- /dev/null
+++ b/missions/contrib/git_branching/09_merge_remote/goal.txt
@@ -0,0 +1,23 @@
+Mission goal
+============
+
+As you can see, the dragon killer enchantment is in pretty weak version but it is amplified thanks to the amplification.spell. Even this amplification shows several contributions that have not been merged yet. The aim is to agregate all contributions of the amplification to the most powerful version of the dragon killer enchantment.
+
+There are several ways to do this. The most natural one is to create a branch ampli where all contributions on the amplifications started, typically on minas/spell. Then, merge all contributions (switching_magma_earth and adding_moisture) to ampli. Finally, as the most powerful version of the dragon killer is already on the spell branch, merging ampli into spell will do the job.
+
+
+Useful commands
+===============
+
+List available branches with
+git branch -a
+The "-a" option means "all" branches, i.e. branches that reflect the branches available on the remote repository on top of the local ones.
+
+Create a branch BRANCH_NAME pointing on commit REV
+git branch BRANCH_NAME REV
+
+To make HEAD point at branch BRANCH_NAME with an updated working directory
+git checkout BRANCH_NAME
+
+To merge BRANCH_NAME into the current branch you are on (your HEAD is pointing at) 
+git merge BRANCH_NAME
diff --git a/missions/contrib/git_branching/09_merge_remote/init.sh b/missions/contrib/git_branching/09_merge_remote/init.sh
new file mode 100644
index 000000000..7aedcf167
--- /dev/null
+++ b/missions/contrib/git_branching/09_merge_remote/init.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    cp $MISSION_DIR/PortalBook $GSH_HOME/Castle/Main_building/Library/
+    . $GSH_TMP/clone.sh &> /dev/null 
+    git reset --hard origin/conflict_solved &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+    . $GSH_TMP/add_remote_minas_co.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_branching/09_merge_remote/static.sh b/missions/contrib/git_branching/09_merge_remote/static.sh
new file mode 100644
index 000000000..5fa3f6d00
--- /dev/null
+++ b/missions/contrib/git_branching/09_merge_remote/static.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
+mkdir -p $GSH_HOME/Castle/Main_building/Library
diff --git a/missions/contrib/git_branching/09_merge_remote/treasure.sh b/missions/contrib/git_branching/09_merge_remote/treasure.sh
new file mode 100644
index 000000000..91c5d3d3d
--- /dev/null
+++ b/missions/contrib/git_branching/09_merge_remote/treasure.sh
@@ -0,0 +1,174 @@
+#!/bin/bash
+
+# === COULEURS ANSI ===
+RED='\033[0;31m'
+BLUE='\033[0;34m'
+YELLOW='\033[1;33m'
+GREEN='\033[0;32m'
+MAGENTA='\033[0;35m'
+NC='\033[0m'
+
+# === TERMINAL ===
+lines=$(tput lines)
+cols=$(tput cols)
+col_red=$((cols / 5))
+col_blue=$((2 * cols / 5))
+col_yellow=$((3 * cols / 5))
+col_magenta=$((4 * cols / 5))
+
+# === INITIALISER PV DRAGON ===
+PV_FILE="pv_dragon.txt"
+if [[ ! -f $PV_FILE ]]; then
+    echo 1000 > "$PV_FILE"
+fi
+
+# === EXPLOSION LARGE ET COLORÉE ===
+explosion_ascii() {
+    local row=$1
+    local col=$2
+    local colors=('\033[0;31m' '\033[0;34m' '\033[1;33m' '\033[0;35m' '\033[1;32m')
+    local symbols=("*" "+" "x" "X" "o" "@")
+
+    for frame in {1..7}; do
+        # Zone 5x5 autour du centre
+        for dr in {-2..2}; do
+            for dc in {-2..2}; do
+                local r=$((row + dr))
+                local c=$((col + dc))
+                local color_index=$(((frame + dr + dc) % ${#colors[@]}))
+                local symbol_index=$(((frame + dr + dc) % ${#symbols[@]}))
+                tput cup $r $c
+                echo -ne "${colors[color_index]}${symbols[symbol_index]}${NC}"
+            done
+        done
+        sleep 0.12
+        # Effacer zone 5x5
+        for dr in {-2..2}; do
+            for dc in {-2..2}; do
+                local r=$((row + dr))
+                local c=$((col + dc))
+                tput cup $r $c
+                echo -ne " "
+            done
+        done
+    done
+}
+
+# === ATTAQUE FLÈCHE ===
+lancer_fleche_verticale() {
+    local color=$1
+    local col=$2
+    local symbol="↓"
+
+    for ((i=0; i<lines-5; i++)); do
+        if (( i > 0 )); then
+            tput cup $((i-1)) $col
+            echo -ne " "
+        fi
+        tput cup $i $col
+        echo -ne "${color}${symbol}${NC}"
+        sleep 0.02
+    done
+
+    local impact_row=$((lines - 5))
+    explosion_ascii "$impact_row" "$col"
+
+    # Réduction de PV - 1 par flèche
+    if [[ -f "$PV_FILE" ]]; then
+        pv=$(<"$PV_FILE")
+        ((pv-=1))
+        ((pv<0)) && pv=0
+        echo "$pv" > "$PV_FILE"
+    fi
+}
+
+# === ATTAQUE BOULET DE CANON ===
+lancer_boulet_canon() {
+    local color=$1
+    local col=$2
+    local symbol="O"
+
+    for ((i=0; i<lines-5; i++)); do
+        if (( i > 0 )); then
+            tput cup $((i-1)) $col
+            echo -ne " "
+        fi
+        tput cup $i $col
+        echo -ne "${color}${symbol}${NC}"
+        sleep 0.03
+    done
+
+    local impact_row=$((lines - 5))
+    explosion_ascii "$impact_row" "$col"
+    dammage=50
+    # Réduction de PV - 10 par boulet
+    if [[ -f "$PV_FILE" ]]; then
+        pv=$(<"$PV_FILE")
+        ((pv-=$dammage))
+        ((pv<0)) && pv=0
+        echo "$pv" > "$PV_FILE"
+    fi
+}
+
+# === AFFICHAGE BARRE DE VIE ===
+afficher_barre_vie() {
+    local pv=$(<"$PV_FILE")
+    local max=1000
+    local longueur=50
+    local remplissage=$((pv * longueur / max))
+    local barre=$(printf "%-${remplissage}s" "#" | tr ' ' '#')
+    local vide=$((longueur - remplissage))
+    local espaces=$(printf "%-${vide}s")
+
+    echo -ne "${GREEN}PV DRAGON: [${barre}${espaces}] $pv / $max${NC}\n"
+}
+
+# === NETTOYAGE ===
+clear
+
+# === ATTAQUES ===
+# Lancer flèches (3)
+#lancer_fleche_verticale "$RED" "$col_red" &
+#sleep 1
+#lancer_fleche_verticale "$BLUE" "$col_blue" &
+#sleep 1
+#lancer_fleche_verticale "$YELLOW" "$col_yellow" &
+#wait
+
+# Lancer boulets de canon (2)
+sleep 0.5
+lancer_boulet_canon "$MAGENTA" "$col_magenta" &
+sleep 0.5
+lancer_boulet_canon "$RED" "$col_red" &
+wait &> /dev/null
+
+sleep 1
+clear
+
+# === AFFICHAGE BARRE DE VIE ===
+#afficher_barre_vie
+#echo
+
+# === DRAGON MÉDIÉVAL ASCII ===
+echo -e "${YELLOW}"
+cat << "EOF"
+                          ___====-_  _-====___
+                    _--^^^#####//      \\#####^^^--_
+                 _-^##########// (    ) \\##########^-_
+                -############//  |\^^/|  \\############-
+              _/############//   (@::@)   \\############\_
+             /#############((     \\//     ))#############\
+            -###############\\    (oo)    //###############-
+           -#################\\  / UUU \  //#################-
+          -###################\\/  (_)  \//###################-
+         _#/|##########/\######(   "-"   )######/\##########|\#_
+         |/ |#/\#/\#/\/  \#/\##\  !   !  /##/\#/  \/\#/\#/\| \|
+         ||/  V  V '     V  \\#\  \___/  /#/  V     '  V  V  \||
+         ||| \ \|  |  |  |  |  |       |  |  |  |  |  |/ / / |||
+         |||  |_|_|_|_|_|_|_|_|_______|_|_|_|_|_|_|_|_|_|  |||
+EOF
+echo -e "${NC}"
+
+# === FIN ===
+echo -e "\n${RED}⚔️  Hooray !! The dragon is down, well done !! ${NC}"
+
diff --git a/missions/contrib/git_branching/10_create_fork/PortalBook b/missions/contrib/git_branching/10_create_fork/PortalBook
new file mode 100644
index 000000000..9d5f09f18
--- /dev/null
+++ b/missions/contrib/git_branching/10_create_fork/PortalBook
@@ -0,0 +1,5 @@
+Al Jeit: https://git.univ-pau.fr/gameshell_git/al_jeit.git
+Minas Tirith: https://git.univ-pau.fr/gameshell_git/minas_tirith.git
+Hogwarts: https://git.univ-pau.fr/gameshell_git/hogwarts.git
+Cair Paravel: https://git.univ-pau.fr/gameshell_git/cair_paravel.git
+Novigrad: https://git.univ-pau.fr/gameshell_git/novigrad.git
diff --git a/missions/contrib/git_branching/10_create_fork/PortalBook_pau b/missions/contrib/git_branching/10_create_fork/PortalBook_pau
new file mode 100644
index 000000000..9d5f09f18
--- /dev/null
+++ b/missions/contrib/git_branching/10_create_fork/PortalBook_pau
@@ -0,0 +1,5 @@
+Al Jeit: https://git.univ-pau.fr/gameshell_git/al_jeit.git
+Minas Tirith: https://git.univ-pau.fr/gameshell_git/minas_tirith.git
+Hogwarts: https://git.univ-pau.fr/gameshell_git/hogwarts.git
+Cair Paravel: https://git.univ-pau.fr/gameshell_git/cair_paravel.git
+Novigrad: https://git.univ-pau.fr/gameshell_git/novigrad.git
diff --git a/missions/contrib/git_branching/10_create_fork/PortalBook_plm b/missions/contrib/git_branching/10_create_fork/PortalBook_plm
new file mode 100644
index 000000000..7e78b8d6a
--- /dev/null
+++ b/missions/contrib/git_branching/10_create_fork/PortalBook_plm
@@ -0,0 +1,5 @@
+Al Jeit: https://plmlab.math.cnrs.fr/gameshell_git/al_jeit.git
+Minas Tirith: https://plmlab.math.cnrs.fr/gameshell_git/minas_tirith.git
+Hogwarts: https://plmlab.math.cnrs.fr/gameshell_git/hogwarts.git
+Cair Paravel: https://plmlab.math.cnrs.fr/gameshell_git/cair_paravel.git
+Novigrad: https://plmlab.math.cnrs.fr/gameshell_git/novigrad.git
diff --git a/missions/contrib/git_branching/10_create_fork/_clean.sh b/missions/contrib/git_branching/10_create_fork/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/10_create_fork/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/10_create_fork/_test.sh b/missions/contrib/git_branching/10_create_fork/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/10_create_fork/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/10_create_fork/_treasure-msg.txt b/missions/contrib/git_branching/10_create_fork/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/10_create_fork/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/10_create_fork/_treasure.sh b/missions/contrib/git_branching/10_create_fork/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/10_create_fork/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/10_create_fork/auto.sh b/missions/contrib/git_branching/10_create_fork/auto.sh
new file mode 100644
index 000000000..de8542ff0
--- /dev/null
+++ b/missions/contrib/git_branching/10_create_fork/auto.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+git remote add myfork git@plmlab.math.cnrs.fr:mhaefele/al_jeit.git
+git push myfork spell --force
+echo "Warning: this auto sets git@plmlab.math.cnrs.fr:mhaefele/al_jeit.git as forked repository. If it fails, sorry you have to do this mission and set up your own fork..."
+gsh check
+
diff --git a/missions/contrib/git_branching/10_create_fork/check.sh b/missions/contrib/git_branching/10_create_fork/check.sh
new file mode 100644
index 000000000..c76e6f9bd
--- /dev/null
+++ b/missions/contrib/git_branching/10_create_fork/check.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(LANG=GB git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+  expected_name="myfork"
+  remote=$(LANG=GB git remote show | grep $expected_name)
+  if [ "$remote" = "" ]
+    then
+        echo "Remote $expected_name does not exist..."
+        return 1
+  fi
+
+  uptodate=$(LANG=GB git remote show myfork | grep "spell pushes to spell" | grep "up to date")
+  if [ "$uptodate" = "" ]
+    then
+        echo "Branch spell is not in sync with repository... Either spell branch has not been pushed or your local spell branch does not point at the commit pointed by the spell branch on the remote fork."
+        return 1
+  fi
+
+  # Store the address of the fork of the user in $GSH_TMP to set it properly in the following init
+  url=$(LANG=GB git remote show myfork | grep "Push  URL" | tr -s ' ' | cut -d ' ' -f 4)
+  echo $url > $GSH_TMP/fork_url
+
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/10_create_fork/clean.sh b/missions/contrib/git_branching/10_create_fork/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/10_create_fork/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/10_create_fork/goal.txt b/missions/contrib/git_branching/10_create_fork/goal.txt
new file mode 100644
index 000000000..ddcab0a4e
--- /dev/null
+++ b/missions/contrib/git_branching/10_create_fork/goal.txt
@@ -0,0 +1,47 @@
+Mission goal
+============
+
+Bad news, the dragon is not dead, he could regenerate and it is now standing again in front of the castle, more dangerous than ever.
+
+However, while the ground is shaking again, you got a telepathic contact of another wizard. Finally you are getting some help !
+
+Check the updated PortalBook and get in touch with this wizard. The objective is to gather all enchantment pieces as fast as possible, so split the work between you too and you will use the forking / merge request mechanism to put everything together.
+
+Until now you only fetched enchantment fragments (commits) and gathered (merged) them locally.
+In order to share spells with other wizards you will need an online place where to share them.
+You should have, of course, write access on this online place. So the al_jeit repository you cloned initially is not the right place.
+That's where the idea of `forks` kicks in: you can replicate an existing public repository on your personal namespace and then have complete write acces on it. 
+
+Consider the wizard team composed by Tim, Bill and lola
+1. Tim forks the al_jeit portal (repository) on the gitlab web interface.
+2. Tim creates a remote named `myfork` that will point to the newly created fork.
+3. Tim pushes his `spell` branch on his fork and checks everything is fine on the web interface.
+4. Bill and Lola fork the newly created forked repository by Tim on the gitlab web interface.
+5. Bill and Lola create also a remote named `myfork` that will point to the newly created fork.
+6. Bill and Lola fetch the `spell` branch from their fork and check that commits come actually from Tim.
+7. Bill and Lola move their `spell` branch on the commit pointed by the spell branch on the remote fork they just fetched.
+
+To validate the mission, each wizard should have a remote named `myfork` and a `spell` branch in sync with the remote.
+
+
+Useful commands
+===============
+
+Add a remote to your local repository
+git remote add REMOTE_NAME REPOSITORY_URL
+
+Push a branch BRANCH_NAME on the remote REMOTE_NAME
+git push REMOTE_NAME BRANCH_NAME
+
+Fetch commits from a remote
+git fetch REMOTE_NAME 
+
+To move branch BRANCH_NAME on commit REF_LOG when HEAD is not pointing at BRANCH_NAME
+git branch -f BRANCH_NAME REF_LOG
+
+REF_LOG is optional and can be:
+- HEAD (default behaviour when REF_LOG is not given)
+- a branch name, either local or referencing a remote one like hogwarts/spell
+- any commit referenced by its id, for instance 30c900f
+- any commit being an ancestor of a branch or HEAD, for instance HEAD^ references the immediate ancestor of HEAD, add_rune^^ references the ancestor of the ancestor of the commit pointed by add_rune.
+
diff --git a/missions/contrib/git_branching/10_create_fork/init.sh b/missions/contrib/git_branching/10_create_fork/init.sh
new file mode 100644
index 000000000..f131b89f4
--- /dev/null
+++ b/missions/contrib/git_branching/10_create_fork/init.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    cp $MISSION_DIR/PortalBook $GSH_HOME/Castle/Main_building/Library/
+    . $GSH_TMP/clone.sh &> /dev/null 
+    git reset --hard origin/merge_remote &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_branching/10_create_fork/static.sh b/missions/contrib/git_branching/10_create_fork/static.sh
new file mode 100644
index 000000000..5fa3f6d00
--- /dev/null
+++ b/missions/contrib/git_branching/10_create_fork/static.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
+mkdir -p $GSH_HOME/Castle/Main_building/Library
diff --git a/missions/contrib/git_branching/11_add_remotes/PortalBook b/missions/contrib/git_branching/11_add_remotes/PortalBook
new file mode 120000
index 000000000..adf88eefa
--- /dev/null
+++ b/missions/contrib/git_branching/11_add_remotes/PortalBook
@@ -0,0 +1 @@
+../10_create_fork/PortalBook
\ No newline at end of file
diff --git a/missions/contrib/git_branching/11_add_remotes/_clean.sh b/missions/contrib/git_branching/11_add_remotes/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/11_add_remotes/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/11_add_remotes/_test.sh b/missions/contrib/git_branching/11_add_remotes/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/11_add_remotes/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/11_add_remotes/_treasure-msg.txt b/missions/contrib/git_branching/11_add_remotes/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/11_add_remotes/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/11_add_remotes/_treasure.sh b/missions/contrib/git_branching/11_add_remotes/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/11_add_remotes/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/11_add_remotes/auto.sh b/missions/contrib/git_branching/11_add_remotes/auto.sh
new file mode 100644
index 000000000..a9c146d5b
--- /dev/null
+++ b/missions/contrib/git_branching/11_add_remotes/auto.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+git remote add Cair https://plmlab.math.cnrs.fr/gameshell_git/cair_paravel.git
+git fetch Cair
+git co adding_dark
+git co switching_air_earth
+git co spell
+
+gsh check
+
diff --git a/missions/contrib/git_branching/11_add_remotes/check.sh b/missions/contrib/git_branching/11_add_remotes/check.sh
new file mode 100644
index 000000000..444605911
--- /dev/null
+++ b/missions/contrib/git_branching/11_add_remotes/check.sh
@@ -0,0 +1,90 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+check_branches() {
+  repo=$1
+  branch1=$2
+  branch2=$3
+  # remotes_url created just before and containing all created remotes
+  # nothing to do if the player is not in charge of the remote given as parameter
+  if [ "$(grep $repo $GSH_TMP/remotes_url)" != "" ]
+  then
+    branch=$branch1
+    if [ "$(LANG=GB git branch | grep $branch)" = "" ]
+    then
+      echo "Branch $branch from repository $repo has not been created..."
+      return 1
+    fi
+    branch=$branch2
+    if [ "$(LANG=GB git branch | grep $branch)" = "" ]
+    then
+      echo "Branch $branch from repository $repo has not been created..."
+      return 1
+    fi
+
+    # Create a file to be able to initialize next question with correct remotes and branches
+    touch $GSH_TMP/$repo
+  fi
+}
+
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(LANG=GB git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+  all_remotes=$(LANG=GB git remote show)
+  rm -f $GSH_TMP/remotes_url
+  touch $GSH_TMP/remotes_url
+  for r in $all_remotes 
+  do  
+    LANG=GB git remote show $r | grep "Push  URL" >> $GSH_TMP/remotes_url
+  done
+  
+  nb_repo=$(wc -l $GSH_TMP/remotes_url | cut -d ' ' -f 1)
+  if [ $nb_repo -lt 3 ]
+  then
+        echo "You did not create a single remote..."
+        return 1
+  fi
+
+  check_branches cair_paravel adding_dark switching_air_earth
+  if [ $? = "1" ] ; then return 1 ; fi
+
+  check_branches hogwarts adding_poison switching_dark_fire
+  if [ $? = "1" ] ; then return 1 ; fi
+
+  check_branches novigrad adding_air switching_water_dark
+  if [ $? = "1" ] ; then return 1 ; fi
+
+  # Store the address of the fork of the user in $GSH_TMP to set it properly in the following init
+  url=$(LANG=GB git remote show myfork | grep "Push  URL" | tr -s ' ' | cut -d ' ' -f 4)
+  echo $url > $GSH_TMP/fork_url
+
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/11_add_remotes/clean.sh b/missions/contrib/git_branching/11_add_remotes/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/11_add_remotes/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/11_add_remotes/goal.txt b/missions/contrib/git_branching/11_add_remotes/goal.txt
new file mode 100644
index 000000000..bd83098f6
--- /dev/null
+++ b/missions/contrib/git_branching/11_add_remotes/goal.txt
@@ -0,0 +1,23 @@
+Mission goal
+============
+
+Check the updated PortalBook, split the work of gathering all enchantment pieces between you and the other(s) wizards(s) and create a remote for each repository you are in charge of.
+Then fetch all necessary repositories and create local branches for each branches that exist remotely.
+Ensure you are on the spell branch at the end.
+
+Useful commands
+===============
+
+Add a remote to your local repository
+git remote add REMOTE_NAME REPOSITORY_URL
+
+Fetch remote repository REMOTE_NAME content locally
+git fetch REMOTE_NAME
+
+The full syntax to create a local branch NEW_BRANCH_NAME that will be connected to the REMOTE_BRANCH_NAME on the remote repository REMOTE is
+git checkout -b NEW_BRANCH_NAME REMOTE/REMOTE_BRANCH_NAME
+This gives full flexibility on naming and can ensure no ambiguity in the command
+
+In simple case (like ours), i.e. when there is a single remote and no name collision between branches 
+git checkout REMOTE_BRANCH_NAME
+will create a local branch REMOTE_BRANCH_NAME, that will be connected to the remote one
diff --git a/missions/contrib/git_branching/11_add_remotes/init.sh b/missions/contrib/git_branching/11_add_remotes/init.sh
new file mode 100644
index 000000000..79776fe47
--- /dev/null
+++ b/missions/contrib/git_branching/11_add_remotes/init.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    cp $MISSION_DIR/PortalBook $GSH_HOME/Castle/Main_building/Library/
+    . $GSH_TMP/clone.sh &> /dev/null 
+    git reset --hard origin/merge_remote &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+    . $GSH_TMP/add_remote_myfork.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_branching/11_add_remotes/static.sh b/missions/contrib/git_branching/11_add_remotes/static.sh
new file mode 100644
index 000000000..5fa3f6d00
--- /dev/null
+++ b/missions/contrib/git_branching/11_add_remotes/static.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
+mkdir -p $GSH_HOME/Castle/Main_building/Library
diff --git a/missions/contrib/git_branching/11a_questions/_clean.sh b/missions/contrib/git_branching/11a_questions/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/11a_questions/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/11a_questions/_test.sh b/missions/contrib/git_branching/11a_questions/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/11a_questions/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/11a_questions/_treasure-msg.txt b/missions/contrib/git_branching/11a_questions/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/11a_questions/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/11a_questions/_treasure.sh b/missions/contrib/git_branching/11a_questions/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/11a_questions/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/11a_questions/auto.sh b/missions/contrib/git_branching/11a_questions/auto.sh
new file mode 100644
index 000000000..236bcd229
--- /dev/null
+++ b/missions/contrib/git_branching/11a_questions/auto.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+cd ..
+gsh skip
+
diff --git a/missions/contrib/git_branching/11a_questions/check.sh b/missions/contrib/git_branching/11a_questions/check.sh
new file mode 100644
index 000000000..773520174
--- /dev/null
+++ b/missions/contrib/git_branching/11a_questions/check.sh
@@ -0,0 +1,137 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+check_answer() {
+result=$1
+error_str=$2
+comment_str=$3
+read -r response
+case "$response" in
+  "" | *[!0-9]*)
+    echo "That's not even a number!"
+    return 1
+    ;;
+  *)
+    if [ "$response" -ne $result ]
+    then
+      echo $error_str
+      return 1
+    fi
+    echo $comment_str
+    ;;
+esac
+}
+
+check_answer_branch() {
+read -r response
+case "$response" in
+  "" | *[!0-9]*)
+    echo "That's not even a number!"
+    return 1
+    ;;
+  *)
+    if [ "$response" = 1 ]
+    then
+      echo "Wrong, this would create the branch work on HEAD, so probably where the spell branch is."
+      return 1
+    elif [ "$response" = 2 ]
+    then
+      echo "Wrong, this would create the branch work at the right place but your HEAD will not point at it, a checkout is missing."
+      return 1
+    elif [ "$response" = 3 ]
+    then
+      echo "Correct ! This would create the branch work at the right place and your HEAD will point at it. Answers 5 and 6 does the same as well"
+      echo ""
+      return 0
+    elif [ "$response" = 4 ]
+    then
+      echo "Wrong, your HEAD will point at the right commit, but in detached mode, the work branch is missing here."
+      return 1
+    elif [ "$response" = 5 ]
+    then
+      echo "Correct ! This would create the branch work at the right place and your HEAD will point at it. Answers 3 and 6 does the same as well"
+      echo ""
+      return 0
+    elif [ "$response" = 6 ]
+    then
+      echo "Correct ! This would create the branch work at the right place and your HEAD will point at it. Answers 3 and 5 does the same as well"
+      echo ""
+      return 0
+    fi
+    echo $comment_str
+    ;;
+esac
+}
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+
+echo "What does the contribution of this repository bring to our spell ?"
+echo "1. a new spell in the form of a .spell file"
+echo "2. a modification of the README.md file"
+echo "3. a modified version of the dragon_killer.spell"
+echo "4. both a new spell in the form of a .spell file and a modification of the README.md file"
+res="4"
+err_str="Too bad! The answer was $res. Look at the difference with \`git diff\` between any revision of the repositpry and the spell branch, it will appear."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+echo "How would you create that branch and make your HEAD point at it ? (Let us assume you are working on the hogwarts repository)"
+echo "1. git checkout -b work"
+echo "2. git branch work hogwarts/spell"
+echo "3. git branch work hogwarts/spell ; git checkout work"
+echo "4. git checkout hogwarts/spell"
+echo "5. git checkout -b work hogwarts/spell"
+echo "6. git checkout hogwarts/spell ; git branch work ; git checkout work"
+
+check_answer_branch 
+if [ $? = "1" ] ; then return 1 ; fi
+  
+echo "Once this \`work\` branch is set up the idea is to merge all contributions of the repository into it. Do you expect any conflict here ?"
+echo "1. no"
+echo "2. yes on the README.md file"
+echo "3. yes on the dragon_killer.spell file"
+echo "4. yes on the LICENSE file"
+res="1"
+err_str="Too bad! The answer was $res. Look at the difference with \`git diff\` between any revision of the repository, it will appear that the different commits never touch the same line when is history has diverged."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+
+echo "Once this \`work\` branch contains all contributions of the repository, the idea is to merge it into our \`spell\` branch. Do you expect any conflict here ? As it is hard to foresee it from here, just answer the question looking at what would happen if any of the three contributions would be merged into \`spell\`"
+echo "1. no"
+echo "2. yes on the README.md file"
+echo "3. yes on the dragon_killer.spell file"
+echo "4. yes on the LICENSE file"
+res="2"
+err_str="Too bad! The answer was $res. Look at the difference with \`git diff\` between any revision of the repository, it will appear that the different commits never touch the same line when is history has diverged."
+check_answer "$res" "$err_str"
+if [ $? = "1" ] ; then return 1 ; fi
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/11a_questions/clean.sh b/missions/contrib/git_branching/11a_questions/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/11a_questions/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/11a_questions/goal.txt b/missions/contrib/git_branching/11a_questions/goal.txt
new file mode 100644
index 000000000..68229b5ce
--- /dev/null
+++ b/missions/contrib/git_branching/11a_questions/goal.txt
@@ -0,0 +1,62 @@
+Mission goal
+============
+
+Good, we have now new enchantments pieces to put together. Let us have a carefull look at them before doing anything.
+
+What does the contribution of this repository bring to our spell ?
+1. a new spell in the form of a .spell file
+2. a modification of the README.md file
+3. a modified version of the dragon_killer.spell
+4. both a new spell in the form of a .spell file and a modification of the README.md file
+
+The objective is to merge all these contributions in our `spell` branch. There are several ways of doing this. If you are in charge of several remotes, it is a good idea to merge contribution from remotes, one after the other.
+Like previously in the adventure, you can start of a new branch named `work` that points at the same commit as spell branch on the remote you are working on.
+
+How would you create that branch and make your HEAD point at it ? (Let us assume you are working on the hogwarts repository)
+1. git checkout -b work
+2. git branch work hogwarts/spell
+3. git branch work hogwarts/spell ; git checkout work
+4. git checkout hogwarts/spell
+5. git checkout -b work hogwarts/spell
+6. git checkout hogwarts/spell ; git branch work ; git checkout work
+
+
+Once this `work` branch is set up the idea is to merge all contributions of the repository into it. Do you expect any conflict here ?
+1. no
+2. yes on the README.md file
+3. yes on the dragon_killer.spell file
+4. yes on the LICENSE file
+
+Once this `work` branch contains all contributions of the repository, the idea is to merge it into our `spell` branch. Do you expect any conflict here ? As it is hard to foresee it from here, just answer the question looking at what would happen if any of the three contributions would be merged into `spell`   
+1. no
+2. yes on the README.md file
+3. yes on the dragon_killer.spell file
+4. yes on the LICENSE file
+
+When you think you have all answers, type `gsh check` to start answering the questions.
+
+Useful commands
+===============
+
+To look at the history of a local repository putting one commit per line (--oneline), showing diverging and converging history (--graph) and all local branches even if they are not part of the history of the commit pointed by HEAD
+git log --oneline --graph --branches
+
+To create a branch BRANCH_NAME pointing at the commit pointed by REF_LOG
+git branch BRANCH_NAME [REF_LOG]
+
+To create a branch BRANCH_NAME pointing at the commit pointed by REF_LOG and to make your HEAD point at it
+git checkout -b BRANCH_NAME [REF_LOG]
+
+
+REF_LOG is optional and can be:
+- HEAD (default behaviour when REF_LOG is not given)
+- a branch name, either local or referencing a remote one like hogwarts/spell
+- any commit referenced by its id, for instance 30c900f
+- any commit being an ancestor of a branch or HEAD, for instance HEAD^ references the immediate ancestor of HEAD, add_rune^^ references the ancestor of the ancestor of the commit pointed by add_rune.
+
+To look at differences between revisions and working directory
+git diff [REF_LOG1 [REF_LOG2]]
+- With a single argument (REF_LOG1 is HEAD by default when no argument is given), it prints the differences between the current working directory and the latest revision
+- With two arguments (REF_LOG2 is HEAD by default when no argument is given), it prints the differences between REF_LOG1 and REF_LOG2
+
+
diff --git a/missions/contrib/git_branching/11a_questions/init.sh b/missions/contrib/git_branching/11a_questions/init.sh
new file mode 100644
index 000000000..9fbe0943b
--- /dev/null
+++ b/missions/contrib/git_branching/11a_questions/init.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    cp $MISSION_DIR/PortalBook $GSH_HOME/Castle/Main_building/Library/
+    . $GSH_TMP/clone.sh &> /dev/null 
+    git reset --hard origin/merge_remote &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+    . $GSH_TMP/add_remote_myfork.sh
+    . $GSH_TMP/add_remote_final_exo.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_branching/11a_questions/skip.txt b/missions/contrib/git_branching/11a_questions/skip.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/missions/contrib/git_branching/11a_questions/static.sh b/missions/contrib/git_branching/11a_questions/static.sh
new file mode 100644
index 000000000..e6293b7fd
--- /dev/null
+++ b/missions/contrib/git_branching/11a_questions/static.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
diff --git a/missions/contrib/git_branching/12_merge_remotes/PortalBook b/missions/contrib/git_branching/12_merge_remotes/PortalBook
new file mode 120000
index 000000000..adf88eefa
--- /dev/null
+++ b/missions/contrib/git_branching/12_merge_remotes/PortalBook
@@ -0,0 +1 @@
+../10_create_fork/PortalBook
\ No newline at end of file
diff --git a/missions/contrib/git_branching/12_merge_remotes/README.md b/missions/contrib/git_branching/12_merge_remotes/README.md
new file mode 100644
index 000000000..ce8b5bad6
--- /dev/null
+++ b/missions/contrib/git_branching/12_merge_remotes/README.md
@@ -0,0 +1,3 @@
+## Amplification spell from Minas Tirith city and other spells coming from other places
+
+This repository is used for git training based on [GameShell_git](https://github.com/MKessar/GameShell_git)
diff --git a/missions/contrib/git_branching/12_merge_remotes/_clean.sh b/missions/contrib/git_branching/12_merge_remotes/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/12_merge_remotes/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/12_merge_remotes/_test.sh b/missions/contrib/git_branching/12_merge_remotes/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/12_merge_remotes/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/12_merge_remotes/_treasure-msg.txt b/missions/contrib/git_branching/12_merge_remotes/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/12_merge_remotes/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/12_merge_remotes/_treasure.sh b/missions/contrib/git_branching/12_merge_remotes/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/12_merge_remotes/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/12_merge_remotes/auto.sh b/missions/contrib/git_branching/12_merge_remotes/auto.sh
new file mode 100644
index 000000000..28323deca
--- /dev/null
+++ b/missions/contrib/git_branching/12_merge_remotes/auto.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+merge_remote() {
+  repo=$1
+  branch1=$2
+  branch2=$3
+  # if file created by `gsh check` of previous exercice is here
+  if [ -f $GSH_TMP/$repo ]
+  then
+    git co -b work $repo/spell
+    git merge $branch1 --no-edit
+    git merge $branch2 --no-edit
+    git co spell
+    git merge work 
+    cp $MISSION_DIR/README.md .
+    git add README.md 
+    git ci --no-edit
+  fi
+}
+
+merge_remote cair_paravel adding_dark switching_air_earth
+merge_remote hogwarts adding_poison switching_dark_fire
+merge_remote novigrad adding_air switching_water_dark
+
+git push myfork spell --force
+
+gsh check
diff --git a/missions/contrib/git_branching/12_merge_remotes/check.sh b/missions/contrib/git_branching/12_merge_remotes/check.sh
new file mode 100644
index 000000000..df7591708
--- /dev/null
+++ b/missions/contrib/git_branching/12_merge_remotes/check.sh
@@ -0,0 +1,74 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+check_branches() {
+  repo=$1
+  branch1=$2
+  branch2=$3
+  if [ -f $GSH_TMP/$repo ]
+  then
+    branch=$branch1
+    log=$(LANG=GB git branch spell --contains $branch)
+    if [ "$log" = "" ]
+    then
+      echo "$branch branch is not merged into spell..."
+      return 1
+    fi
+    branch=$branch2
+    log=$(LANG=GB git branch spell --contains $branch)
+    if [ "$log" = "" ]
+    then
+      echo "$branch branch is not merged into spell..."
+      return 1
+    fi
+  fi
+}
+
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(LANG=GB git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+  check_branches cair_paravel adding_dark switching_air_earth
+  if [ $? = "1" ] ; then return 1 ; fi
+
+  check_branches hogwarts adding_poison switching_dark_fire
+  if [ $? = "1" ] ; then return 1 ; fi
+
+  check_branches novigrad adding_air switching_water_dark
+  if [ $? = "1" ] ; then return 1 ; fi
+
+  uptodate=$(LANG=GB git remote show myfork | grep "spell pushes to spell" | grep "up to date")
+  if [ "$uptodate" = "" ]
+    then
+        echo "Branch spell has not been pushed to the forked repository..."
+        return 1
+  fi
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/12_merge_remotes/clean.sh b/missions/contrib/git_branching/12_merge_remotes/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/12_merge_remotes/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/12_merge_remotes/goal.txt b/missions/contrib/git_branching/12_merge_remotes/goal.txt
new file mode 100644
index 000000000..9d3e91804
--- /dev/null
+++ b/missions/contrib/git_branching/12_merge_remotes/goal.txt
@@ -0,0 +1,28 @@
+Mission goal
+============
+
+Now we have a plan ! Merge the pieces you are in charge of in the spell branch according to the plan and, once done, push your updated spell branch on your fork.
+
+
+Useful commands
+===============
+
+To merge a branch. Ensure you are on the branch you want to merge into and then
+git merge BRANCH_NAME
+
+If you end up into a CONFLICT and would like to abort the current merge operation
+git merge --abort
+
+To change your HEAD on a branch and update the working directory
+git checkout BRANCH_NAME
+
+The full syntax to create a local branch NEW_BRANCH_NAME that will be connected to the REMOTE_BRANCH_NAME on the remote repository REMOTE is
+git checkout -b NEW_BRANCH_NAME REMOTE/REMOTE_BRANCH_NAME
+This gives full flexibility on naming and can ensure no ambiguity in the command
+
+In simple case (like ours), i.e. when there is a single remote and no name collision between branches 
+git checkout REMOTE_BRANCH_NAME
+will create a local branch REMOTE_BRANCH_NAME, that will be connected to the remote one
+
+Push a branch BRANCH_NAME on the remote REMOTE_NAME
+git push REMOTE_NAME BRANCH_NAME
diff --git a/missions/contrib/git_branching/12_merge_remotes/init.sh b/missions/contrib/git_branching/12_merge_remotes/init.sh
new file mode 100644
index 000000000..9fbe0943b
--- /dev/null
+++ b/missions/contrib/git_branching/12_merge_remotes/init.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    cp $MISSION_DIR/PortalBook $GSH_HOME/Castle/Main_building/Library/
+    . $GSH_TMP/clone.sh &> /dev/null 
+    git reset --hard origin/merge_remote &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+    . $GSH_TMP/add_remote_myfork.sh
+    . $GSH_TMP/add_remote_final_exo.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_branching/12_merge_remotes/static.sh b/missions/contrib/git_branching/12_merge_remotes/static.sh
new file mode 100644
index 000000000..5fa3f6d00
--- /dev/null
+++ b/missions/contrib/git_branching/12_merge_remotes/static.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
+mkdir -p $GSH_HOME/Castle/Main_building/Library
diff --git a/missions/contrib/git_branching/13_merge_forks/PortalBook b/missions/contrib/git_branching/13_merge_forks/PortalBook
new file mode 120000
index 000000000..adf88eefa
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/PortalBook
@@ -0,0 +1 @@
+../10_create_fork/PortalBook
\ No newline at end of file
diff --git a/missions/contrib/git_branching/13_merge_forks/README.md b/missions/contrib/git_branching/13_merge_forks/README.md
new file mode 120000
index 000000000..7f1ad867d
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/README.md
@@ -0,0 +1 @@
+../12_merge_remotes/README.md
\ No newline at end of file
diff --git a/missions/contrib/git_branching/13_merge_forks/_clean.sh b/missions/contrib/git_branching/13_merge_forks/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_branching/13_merge_forks/_test.sh b/missions/contrib/git_branching/13_merge_forks/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_branching/13_merge_forks/_treasure-msg.txt b/missions/contrib/git_branching/13_merge_forks/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_branching/13_merge_forks/_treasure.sh b/missions/contrib/git_branching/13_merge_forks/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_branching/13_merge_forks/auto.sh b/missions/contrib/git_branching/13_merge_forks/auto.sh
new file mode 100644
index 000000000..818fff54f
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/auto.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cp $MISSION_DIR/*.spell .
+
+gsh check
diff --git a/missions/contrib/git_branching/13_merge_forks/check.sh b/missions/contrib/git_branching/13_merge_forks/check.sh
new file mode 100644
index 000000000..dbb36b197
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/check.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  goal=$GSH_HOME/Castle/Portals/al_jeit
+  current="$PWD"
+
+  if [ "$goal" != "$current" ] 
+    then 
+      echo "You are not in the Al Jeit portal"
+      return 1
+  fi
+
+  current_branch=$(LANG=GB git branch --show-current)
+  if [ "$current_branch" != "spell" ]
+    then
+        echo "You are not on the spell branch..."
+        return 1
+  fi
+
+  for f in dragon_killer.spell no_regen.spell poison.spell weaken.spell
+  do
+    if [ ! -f "$f" ]
+    then
+      echo "Spell $f not present..."
+      return 1
+    fi
+
+    d=$(diff $f $MISSION_DIR/$f)
+    if [ "$d" != "" ]
+    then
+      echo "Something went wrong, spell $f is not as expected..."
+      diff $f $MISSION_DIR/$f
+      return 1
+    fi
+
+
+  done
+
+  return 0
+
+}
+_mission_check
diff --git a/missions/contrib/git_branching/13_merge_forks/clean.sh b/missions/contrib/git_branching/13_merge_forks/clean.sh
new file mode 120000
index 000000000..806b90ef0
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/clean.sh
@@ -0,0 +1 @@
+../00_prepare_bare_repo/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_branching/13_merge_forks/dragon_killer.spell b/missions/contrib/git_branching/13_merge_forks/dragon_killer.spell
new file mode 100644
index 000000000..61e8c49b4
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/dragon_killer.spell
@@ -0,0 +1,4 @@
+30 22
+30 11
+20 111
+20 66
diff --git a/missions/contrib/git_branching/13_merge_forks/goal.txt b/missions/contrib/git_branching/13_merge_forks/goal.txt
new file mode 100644
index 000000000..33ad67234
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/goal.txt
@@ -0,0 +1,16 @@
+Mission goal
+============
+
+We are almost there ! Now enchantments pieces are partially gathered but still split between different forks. Use the merge request mechanism on the web interface to merge everything and pull the final dargon killer enchantment with all boosters locally. Hopefully the dragon will pass away...
+
+The wizard(s) that has(ve) forked the initial fork will now create a merge request on this initial fork on the web interface so all the pieces ou assembled on your side have a chance to be assembled all together. The owner of the initial fork should then accept all the merge requests on the web interface. Finally, he will need to pull locally the latest version of the `spell` branch that has been updated on the remote repository. The others will have to update their fork and pull similarly the latest version of the `spell` branch.
+
+Useful commands
+===============
+
+Operations are mainly done on the web interface
+
+To fetch and merge you can use pull shortcut
+git pull REMOTE BRANCH_NAME
+will fetch new commits from REMOTE and then merge BRANCH_NAME into the current branch
+
diff --git a/missions/contrib/git_branching/13_merge_forks/init.sh b/missions/contrib/git_branching/13_merge_forks/init.sh
new file mode 100644
index 000000000..fe95804e6
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/init.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    cp $MISSION_DIR/PortalBook $GSH_HOME/Castle/Main_building/Library/
+    . $GSH_TMP/clone.sh &> /dev/null 
+    git reset --hard origin/merge_remote &> /dev/null
+    . $GSH_TMP/remove_marker_branch_repo.sh &> /dev/null
+    . $GSH_TMP/add_remote_myfork.sh
+    . $GSH_TMP/add_remote_final_exo.sh
+    . $GSH_TMP/merge_remote.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_branching/13_merge_forks/no_regen.spell b/missions/contrib/git_branching/13_merge_forks/no_regen.spell
new file mode 100644
index 000000000..5dbf63e25
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/no_regen.spell
@@ -0,0 +1,5 @@
+15 55
+15 66
+50 88
+15 99
+05 11
diff --git a/missions/contrib/git_branching/13_merge_forks/poison.spell b/missions/contrib/git_branching/13_merge_forks/poison.spell
new file mode 100644
index 000000000..193324b9c
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/poison.spell
@@ -0,0 +1,5 @@
+05 44
+05 33
+05 88
+90 99
+05 55
diff --git a/missions/contrib/git_branching/13_merge_forks/static.sh b/missions/contrib/git_branching/13_merge_forks/static.sh
new file mode 100644
index 000000000..5fa3f6d00
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/static.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+
+mkdir -p $GSH_HOME/Castle/Portals/
+mkdir -p $GSH_HOME/Castle/Main_building/Library
diff --git a/missions/contrib/git_branching/13_merge_forks/treasure.sh b/missions/contrib/git_branching/13_merge_forks/treasure.sh
new file mode 100755
index 000000000..b967c384d
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/treasure.sh
@@ -0,0 +1,500 @@
+#!/bin/bash
+
+# === COULEURS ANSI ===
+RED='\033[0;31m'
+BLUE='\033[0;34m'
+YELLOW='\033[1;33m'
+GREEN='\033[0;32m'
+MAGENTA='\033[0;35m'
+NC='\033[0m'
+
+# === TERMINAL ===
+lines=$(tput lines)
+cols=$(tput cols)
+col_red=$((cols / 5))
+col_blue=$((2 * cols / 5))
+col_yellow=$((3 * cols / 5))
+col_magenta=$((4 * cols / 5))
+
+# === INITIALISER PV DRAGON ===
+PV_FILE="pv_dragon.txt"
+if [[ ! -f $PV_FILE ]]; then
+    echo 1000 > "$PV_FILE"
+fi
+
+# === EXPLOSION LARGE ET COLORÉE ===
+explosion_ascii() {
+    local row=$1
+    local col=$2
+    local colors=('\033[0;31m' '\033[0;34m' '\033[1;33m' '\033[0;35m' '\033[1;32m')
+    local symbols=("*" "+" "x" "X" "o" "@")
+
+    for frame in {1..7}; do
+        # Zone 5x5 autour du centre
+        for dr in {-2..2}; do
+            for dc in {-2..2}; do
+                local r=$((row + dr))
+                local c=$((col + dc))
+                local color_index=$(((frame + dr + dc) % ${#colors[@]}))
+                local symbol_index=$(((frame + dr + dc) % ${#symbols[@]}))
+                tput cup $r $c
+                echo -ne "${colors[color_index]}${symbols[symbol_index]}${NC}"
+            done
+        done
+        sleep 0.12
+        # Effacer zone 5x5
+        for dr in {-2..2}; do
+            for dc in {-2..2}; do
+                local r=$((row + dr))
+                local c=$((col + dc))
+                tput cup $r $c
+                echo -ne " "
+            done
+        done
+    done
+}
+
+explosion_fragmentation_1() {
+    local row=$1
+    local col=$2
+    local colors=('\033[0;31m' '\033[0;33m' '\033[0;34m' '\033[0;35m' '\033[1;32m')
+    local symbols=("+" "*" "x" "o" "@")
+
+    # Explosion centrale 5x5 (comme avant)
+    for frame in {1..5}; do
+        for dr in {-2..2}; do
+            for dc in {-2..2}; do
+                local r=$((row + dr))
+                local c=$((col + dc))
+                local color_index=$(((frame + dr + dc) % ${#colors[@]}))
+                local symbol_index=$(((frame + dr + dc) % ${#symbols[@]}))
+                tput cup $r $c
+                echo -ne "${colors[color_index]}${symbols[symbol_index]}${NC}"
+            done
+        done
+        sleep 0.1
+        # Effacer zone 5x5
+        for dr in {-2..2}; do
+            for dc in {-2..2}; do
+                tput cup $((row + dr)) $((col + dc))
+                echo -ne " "
+            done
+        done
+    done
+
+    # FRAGMENTS qui explosent en 8 directions
+    local directions=(
+        "-1 0"    # haut
+        "-1 1"    # haut-droite
+        "0 1"     # droite
+        "1 1"     # bas-droite
+        "1 0"     # bas
+        "1 -1"    # bas-gauche
+        "0 -1"    # gauche
+        "-1 -1"   # haut-gauche
+    )
+    local frag_symbols=("${symbols[@]}")
+
+    # Initial positions des fragments au centre
+    local frag_pos=()
+    for ((i=0; i<8; i++)); do
+        frag_pos+=( "$row $col" )
+    done
+
+    # Animation fragments : 4 pas
+    for step in {1..4}; do
+        # Effacer anciens fragments
+        if (( step > 1 )); then
+            for ((i=0; i<8; i++)); do
+                read -r r c <<< "${frag_pos[i]}"
+                tput cup $r $c
+                echo -ne " "
+            done
+        fi
+
+        # Calculer nouvelles positions
+        for ((i=0; i<8; i++)); do
+            read -r r c <<< "${frag_pos[i]}"
+            read -r dr dc <<< "${directions[i]}"
+            r=$((r + dr))
+            c=$((c + dc))
+            frag_pos[i]="$r $c"
+        done
+
+        # Afficher fragments
+        for ((i=0; i<8; i++)); do
+            read -r r c <<< "${frag_pos[i]}"
+            local color_index=$((i % ${#colors[@]}))
+            local symbol=${frag_symbols[i % ${#frag_symbols[@]}]}
+            # S'assurer qu'on est dans les bornes
+            if (( r >= 0 && r < lines && c >= 0 && c < cols )); then
+                tput cup $r $c
+                echo -ne "${colors[color_index]}${symbol}${NC}"
+            fi
+        done
+
+        sleep 0.12
+    done
+
+    # Effacer derniers fragments
+    for ((i=0; i<8; i++)); do
+        read -r r c <<< "${frag_pos[i]}"
+        if (( r >= 0 && r < lines && c >= 0 && c < cols )); then
+            tput cup $r $c
+            echo -ne " "
+        fi
+    done
+}
+
+explosion_fragmentation() {
+    local row=$1
+    local col=$2
+    local color=$3
+    local symbols=("+" "*" "x" "o" "@")
+
+    # Explosion centrale 5x5 en couleur du boulet
+    for frame in {1..5}; do
+        for dr in {-2..2}; do
+            for dc in {-2..2}; do
+                local r=$((row + dr))
+                local c=$((col + dc))
+                local symbol_index=$(((frame + dr + dc) % ${#symbols[@]}))
+                tput cup $r $c
+                echo -ne "${color}${symbols[symbol_index]}${NC}"
+            done
+        done
+        sleep 0.1
+        # Effacer zone 5x5
+        for dr in {-2..2}; do
+            for dc in {-2..2}; do
+                tput cup $((row + dr)) $((col + dc))
+                echo -ne " "
+            done
+        done
+    done
+
+    # Directions des fragments
+    local directions=(
+        "-1 0"    # haut
+        "-1 1"    # haut-droite
+        "0 1"     # droite
+        "1 1"     # bas-droite
+        "1 0"     # bas
+        "1 -1"    # bas-gauche
+        "0 -1"    # gauche
+        "-1 -1"   # haut-gauche
+    )
+    local frag_symbols=("${symbols[@]}")
+
+    local frag_pos=()
+    for ((i=0; i<8; i++)); do
+        frag_pos+=( "$row $col" )
+    done
+
+    for step in {1..4}; do
+        if (( step > 1 )); then
+            for ((i=0; i<8; i++)); do
+                read -r r c <<< "${frag_pos[i]}"
+                tput cup $r $c
+                echo -ne " "
+            done
+        fi
+
+        for ((i=0; i<8; i++)); do
+            read -r r c <<< "${frag_pos[i]}"
+            read -r dr dc <<< "${directions[i]}"
+            r=$((r + dr))
+            c=$((c + dc))
+            frag_pos[i]="$r $c"
+        done
+
+        for ((i=0; i<8; i++)); do
+            read -r r c <<< "${frag_pos[i]}"
+            local symbol=${frag_symbols[i % ${#frag_symbols[@]}]}
+            if (( r >= 0 && r < lines && c >= 0 && c < cols )); then
+                tput cup $r $c
+                echo -ne "${color}${symbol}${NC}"
+            fi
+        done
+
+        sleep 0.12
+    done
+
+    for ((i=0; i<8; i++)); do
+        read -r r c <<< "${frag_pos[i]}"
+        if (( r >= 0 && r < lines && c >= 0 && c < cols )); then
+            tput cup $r $c
+            echo -ne " "
+        fi
+    done
+}
+
+explosion_fragmentation_gros_boulet() {
+    local row=$1
+    local col=$2
+    local color=$3
+    local symbols=("+" "*" "x" "o" "@" "#")
+
+    # Explosion centrale 7x7
+    for frame in {1..6}; do
+        for dr in {-3..3}; do
+            for dc in {-3..3}; do
+                local r=$((row + dr))
+                local c=$((col + dc))
+                local idx=$(((frame + dr + dc) % ${#symbols[@]}))
+                if (( r >=0 && r < lines && c >=0 && c < cols )); then
+                    tput cup $r $c
+                    echo -ne "${color}${symbols[idx]}${NC}"
+                fi
+            done
+        done
+        sleep 0.1
+        # Effacer zone 7x7
+        for dr in {-3..3}; do
+            for dc in {-3..3}; do
+                local r=$((row + dr))
+                local c=$((col + dc))
+                if (( r >=0 && r < lines && c >=0 && c < cols )); then
+                    tput cup $r $c
+                    echo -ne " "
+                fi
+            done
+        done
+    done
+
+
+    # Directions des fragments (16 directions)
+    local directions=(
+        "-1 0"   "-1 1"   "0 1"   "1 1"   "1 0"   "1 -1"   "0 -1"   "-1 -1"
+        "-2 1"   "2 1"    "1 2"   "-1 2"  "-2 -1" "2 -1"   "1 -2"   "-1 -2"
+    )
+    local frag_symbols=("${symbols[@]}")
+
+    # Position initiale des fragments : au centre
+    local frag_pos=()
+    for ((i=0; i<16; i++)); do
+        frag_pos+=( "$row $col" )
+    done
+
+    # Animation fragments : 5 pas
+    for step in {1..5}; do
+        if (( step > 1 )); then
+            for ((i=0; i<16; i++)); do
+                read -r r c <<< "${frag_pos[i]}"
+                if (( r >=0 && r < lines && c >=0 && c < cols )); then
+                    tput cup $r $c
+                    echo -ne " "
+                fi
+            done
+        fi
+
+        for ((i=0; i<16; i++)); do
+            read -r r c <<< "${frag_pos[i]}"
+            read -r dr dc <<< "${directions[i]}"
+            r=$((r + dr))
+            c=$((c + dc))
+            frag_pos[i]="$r $c"
+        done
+
+        for ((i=0; i<16; i++)); do
+            read -r r c <<< "${frag_pos[i]}"
+            local symbol=${frag_symbols[i % ${#frag_symbols[@]}]}
+            if (( r >=0 && r < lines && c >=0 && c < cols )); then
+                tput cup $r $c
+                echo -ne "${color}${symbol}${NC}"
+            fi
+        done
+
+        sleep 0.12
+    done
+
+    # Effacer derniers fragments
+    for ((i=0; i<16; i++)); do
+        read -r r c <<< "${frag_pos[i]}"
+        if (( r >=0 && r < lines && c >=0 && c < cols )); then
+            tput cup $r $c
+            echo -ne " "
+        fi
+    done
+}
+
+
+# === ATTAQUE FLÈCHE ===
+lancer_fleche_verticale() {
+    local color=$1
+    local col=$2
+    local symbol="↓"
+
+    for ((i=0; i<lines-5; i++)); do
+        if (( i > 0 )); then
+            tput cup $((i-1)) $col
+            echo -ne " "
+        fi
+        tput cup $i $col
+        echo -ne "${color}${symbol}${NC}"
+        sleep 0.02
+    done
+
+    local impact_row=$((lines - 5))
+    explosion_ascii "$impact_row" "$col"
+
+    # Réduction de PV - 1 par flèche
+    if [[ -f "$PV_FILE" ]]; then
+        pv=$(<"$PV_FILE")
+        ((pv-=1))
+        ((pv<0)) && pv=0
+        echo "$pv" > "$PV_FILE"
+    fi
+}
+
+# === ATTAQUE BOULET DE CANON ===
+lancer_boulet_canon() {
+    local color=$1
+    local col=$2
+    local symbol="O"
+
+    for ((i=0; i<lines-5; i++)); do
+        if (( i > 0 )); then
+            tput cup $((i-1)) $col
+            echo -ne " "
+        fi
+        tput cup $i $col
+        echo -ne "${color}${symbol}${NC}"
+        sleep 0.03
+    done
+
+    local impact_row=$((lines - 5))
+    #explosion_ascii "$impact_row" "$col"
+    dammage=50
+    # Réduction de PV - 10 par boulet
+    if [[ -f "$PV_FILE" ]]; then
+        pv=$(<"$PV_FILE")
+        ((pv-=$dammage))
+        ((pv<0)) && pv=0
+        echo "$pv" > "$PV_FILE"
+    fi
+}
+
+# Gros boulet de canon
+boulet_grand=(
+"  (@@@)  "
+" ( @@@ ) "
+"  (@@@)  "
+)
+
+# === ATTAQUE GROS BOULET DE CANON ===
+lancer_boulet_canon_gros() {
+    local color=$1
+    local col=$2
+
+    local height=${#boulet_grand[@]}
+    local start_row=0
+    local max_row=$((lines - height - 5))
+
+    for ((i=start_row; i<=max_row; i++)); do
+        # Effacer la position précédente
+        if (( i > start_row )); then
+            for ((j=0; j<height; j++)); do
+                tput cup $((i - 1 + j)) $col
+                echo -ne "         "  # même largeur que la ligne du boulet
+            done
+        fi
+        # Afficher boulet à la position i
+        for ((j=0; j<height; j++)); do
+            tput cup $((i + j)) $col
+            echo -ne "${color}${boulet_grand[j]}${NC}"
+        done
+
+        sleep 0.05
+    done
+    tput cup $row $col
+    echo -ne " "
+    local impact_row=$((max_row + height / 2))
+    #explosion_ascii "$impact_row" "$col"
+    #explosion_fragmentation "$impact_row" "$col"
+    #explosion_fragmentation "$impact_row" "$col" "$color"
+    explosion_fragmentation_gros_boulet "$impact_row" "$col" "$color"
+
+    dammage=150
+    # Réduction de PV - 20 par gros boulet
+    if [[ -f "$PV_FILE" ]]; then
+        pv=$(<"$PV_FILE")
+        ((pv-=$dammage))
+        ((pv<0)) && pv=0
+        echo "$pv" > "$PV_FILE"
+    fi
+}
+
+# === AFFICHAGE BARRE DE VIE ===
+afficher_barre_vie() {
+    local pv=$(<"$PV_FILE")
+    local max=1000
+    local longueur=50
+    local remplissage=$((pv * longueur / max))
+    local barre=$(printf "%-${remplissage}s" "#" | tr ' ' '#')
+    local vide=$((longueur - remplissage))
+    local espaces=$(printf "%-${vide}s")
+
+    echo -ne "${GREEN}PV DRAGON: [${barre}${espaces}] $pv / $max${NC}\n"
+}
+
+# === NETTOYAGE ===
+clear
+
+# === ATTAQUES ===
+# Lancer flèches (3)
+#lancer_fleche_verticale "$RED" "$col_red" &
+#sleep 1
+#lancer_fleche_verticale "$BLUE" "$col_blue" &
+#sleep 1
+#lancer_fleche_verticale "$YELLOW" "$col_yellow" &
+#wait
+
+# Lancer boulets de canon (2)
+#sleep 1
+#lancer_boulet_canon "$MAGENTA" "$col_magenta" &
+#sleep 1
+#lancer_boulet_canon "$RED" "$col_red" &
+#wait
+#
+#sleep 1
+#clear
+
+
+# Lancer gros boulets de canon (2)
+sleep 0.5
+lancer_boulet_canon_gros "$MAGENTA" "$col_magenta";
+clear;
+sleep 0.5
+lancer_boulet_canon_gros "$RED" "$col_red";
+clear;
+wait
+sleep 1
+clear
+# === AFFICHAGE BARRE DE VIE ===
+#afficher_barre_vie
+#echo
+
+# === DRAGON MÉDIÉVAL ASCII ===
+echo -e "${YELLOW}"
+cat << "EOF"
+                          ___====-_  _-====___
+                    _--^^^#####//      \\#####^^^--_
+                 _-^##########// (    ) \\##########^-_
+                -############//  |\^^/|  \\############-
+              _/############//   (@::@)   \\############\_
+             /#############((     \\//     ))#############\
+            -###############\\    (oo)    //###############-
+           -#################\\  / UUU \  //#################-
+          -###################\\/  (_)  \//###################-
+         _#/|##########/\######(   "-"   )######/\##########|\#_
+         |/ |#/\#/\#/\/  \#/\##\  !   !  /##/\#/  \/\#/\#/\| \|
+         ||/  V  V '     V  \\#\  \___/  /#/  V     '  V  V  \||
+         ||| \ \|  |  |  |  |  |       |  |  |  |  |  |/ / / |||
+         |||  |_|_|_|_|_|_|_|_|_______|_|_|_|_|_|_|_|_|_|  |||
+EOF
+echo -e "${NC}"
+
+# === FIN ===
+echo -e "\n${RED}⚔️  This time the dragon stays on the ground, you did it !! ...${NC}"
+
diff --git a/missions/contrib/git_branching/13_merge_forks/weaken.spell b/missions/contrib/git_branching/13_merge_forks/weaken.spell
new file mode 100644
index 000000000..3d33f0a28
--- /dev/null
+++ b/missions/contrib/git_branching/13_merge_forks/weaken.spell
@@ -0,0 +1,5 @@
+30 22
+30 222
+05 33
+25 11
+10 99
diff --git a/missions/contrib/git_branching/git_branching.idx b/missions/contrib/git_branching/git_branching.idx
new file mode 100644
index 000000000..652d24303
--- /dev/null
+++ b/missions/contrib/git_branching/git_branching.idx
@@ -0,0 +1,17 @@
+00_prepare_bare_repo
+01_clone
+02_local_branch
+02a_questions
+03_mergeFF
+04_contrib
+05_merge
+05a_questions
+06_merge_conflict
+07_delete_branch
+08_add_remote
+09_merge_remote
+10_create_fork
+11_add_remotes
+11a_questions
+12_merge_remotes
+13_merge_forks
diff --git a/missions/contrib/git_config/01_createGHacc/_auto.sh b/missions/contrib/git_config/01_createGHacc/_auto.sh
new file mode 100644
index 000000000..3f24ca772
--- /dev/null
+++ b/missions/contrib/git_config/01_createGHacc/_auto.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
diff --git a/missions/contrib/git_config/01_createGHacc/_clean.sh b/missions/contrib/git_config/01_createGHacc/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_config/01_createGHacc/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_config/01_createGHacc/_test.sh b/missions/contrib/git_config/01_createGHacc/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_config/01_createGHacc/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_config/01_createGHacc/_treasure-msg.txt b/missions/contrib/git_config/01_createGHacc/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_config/01_createGHacc/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_config/01_createGHacc/_treasure.sh b/missions/contrib/git_config/01_createGHacc/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_config/01_createGHacc/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_config/01_createGHacc/check.sh b/missions/contrib/git_config/01_createGHacc/check.sh
new file mode 100644
index 000000000..f1ffda670
--- /dev/null
+++ b/missions/contrib/git_config/01_createGHacc/check.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  # verifier que le repertoire existe et est un depot git
+
+  printf "%s " "$(gettext "Please type your github login")"
+  read -r r
+
+  if [ -z "$r"  ]
+  then
+      echo " login not provided"
+    return 1
+  else
+      echo " The login you provided is $r "
+      
+      printf "%s " "$(gettext "is that correct ? [y/n]")"
+      read -r s
+
+       if [ "$s" != "y" ]
+          then
+          echo "$(gettext "please try again to provid your login")"
+       return 1
+       fi
+
+  fi
+    return 0 
+}
+_mission_check
diff --git a/missions/contrib/git_config/01_createGHacc/goal.txt b/missions/contrib/git_config/01_createGHacc/goal.txt
new file mode 100644
index 000000000..c32feabbe
--- /dev/null
+++ b/missions/contrib/git_config/01_createGHacc/goal.txt
@@ -0,0 +1,34 @@
+Mission goal
+============
+
+Some spellBook are accessible to anybody, but some require the approriate library card(Login and authenficiation on Github, Gitalb, ... ).
+
+To proceed with the next step of the training session, you need to create your first library card.
+
+
+Remarks
+============
+ 
+If you are going to work with github:
+
+Create an account on github. Then log onto the github web site.
+
+Then provide your github login when performing the gsh check.
+
+
+
+
+the url for github is: https://github.com/
+
+the documentation on creating a github repository is here: https://docs.github.com
+
+
+
+Usefull commands
+================
+
+you can open a new tab using:
+
+firefox URL
+
+
diff --git a/missions/contrib/git_config/01_createGHacc/init.sh b/missions/contrib/git_config/01_createGHacc/init.sh
new file mode 100644
index 000000000..ca7485185
--- /dev/null
+++ b/missions/contrib/git_config/01_createGHacc/init.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  # ...
+  mkdir -p $GSH_HOME/Castle/Portals/
+  if ! git --version > /dev/null 2 > /dev/null
+    then  echo "git not found"
+    return 1
+  fi
+  
+  
+}
+_mission_init
diff --git a/missions/contrib/git_config/01_createGHacc/static.sh b/missions/contrib/git_config/01_createGHacc/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_config/01_createGHacc/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_config/02_configGitID/_clean.sh b/missions/contrib/git_config/02_configGitID/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_config/02_configGitID/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_config/02_configGitID/_test.sh b/missions/contrib/git_config/02_configGitID/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_config/02_configGitID/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_config/02_configGitID/_treasure-msg.txt b/missions/contrib/git_config/02_configGitID/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_config/02_configGitID/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_config/02_configGitID/_treasure.sh b/missions/contrib/git_config/02_configGitID/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_config/02_configGitID/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_config/02_configGitID/auto.sh b/missions/contrib/git_config/02_configGitID/auto.sh
new file mode 100644
index 000000000..0eedbd2ae
--- /dev/null
+++ b/missions/contrib/git_config/02_configGitID/auto.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
+
+cd $GSH_HOME/Castle/Portals/spellbook
+git config --local user.name "Jafar"
+git config --local user.email jafar@aladin.cool
+gsh check
diff --git a/missions/contrib/git_config/02_configGitID/check.sh b/missions/contrib/git_config/02_configGitID/check.sh
new file mode 100644
index 000000000..ea697c549
--- /dev/null
+++ b/missions/contrib/git_config/02_configGitID/check.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+cd $GSH_HOME/Castle/Portals/spellbook
+  
+git config user.email > /dev/null
+  
+if [ $? -eq 1 ]
+then
+  echo " There is no user.email defined locally or globaly for git"
+  return 1
+else
+  echo " user.email is defined"
+fi
+
+          
+git config user.name > /dev/null
+if [ $? -eq 1 ]
+then 
+  echo " There is no user.name defined locally or globaly for git"
+  return 1
+else
+  echo " user.name is defined"
+fi
+
+cp .git/config $GSH_TMP/gitconfig
+    
+return 0 
+}
+_mission_check
diff --git a/missions/contrib/git_config/02_configGitID/clean.sh b/missions/contrib/git_config/02_configGitID/clean.sh
new file mode 120000
index 000000000..614a72e95
--- /dev/null
+++ b/missions/contrib/git_config/02_configGitID/clean.sh
@@ -0,0 +1 @@
+../../git_basics/00_needed_files/clean.sh
\ No newline at end of file
diff --git a/missions/contrib/git_config/02_configGitID/goal.txt b/missions/contrib/git_config/02_configGitID/goal.txt
new file mode 100644
index 000000000..f1df12b6b
--- /dev/null
+++ b/missions/contrib/git_config/02_configGitID/goal.txt
@@ -0,0 +1,25 @@
+Mission goal
+============
+
+The magic concil wants to keep a record of any modifications on the library.
+
+They also need to keep track of who has made changes, just for safety reason. That's why they want you to include your identity in your staff.
+
+You neeed to configure your git identity on your computer to be able to perfom "commits" (this term will be defined later).
+
+You Need to be in spellbook to configure your ID.
+
+Useful commands
+===============
+
+git config --local user.name "FIRSTNAME LASTNAME"
+git config --local user.email ME@EMAIL.FR
+
+NB:
+
+The same commands can be run with `--global` instead of `--local` which is recommended if you have the same identity for all your projects. 
+But it will not work inside gameshell, so stick to `--local` please.
+
+
+
+
diff --git a/missions/contrib/git_config/02_configGitID/init.sh b/missions/contrib/git_config/02_configGitID/init.sh
new file mode 100644
index 000000000..6f57e56bc
--- /dev/null
+++ b/missions/contrib/git_config/02_configGitID/init.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+
+  if [ -f $GSH_TMP/skip_init ]
+  then
+    rm $GSH_TMP/skip_init
+  else
+    . $GSH_TMP/clone.sh &> /dev/null
+    . $GSH_TMP/remove_init_branches.sh &> /dev/null
+    . $GSH_TMP/add_remote_origin.sh
+  fi
+  
+}
+_mission_init
diff --git a/missions/contrib/git_config/02_configGitID/static.sh b/missions/contrib/git_config/02_configGitID/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_config/02_configGitID/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_config/git_config.idx b/missions/contrib/git_config/git_config.idx
new file mode 100644
index 000000000..92bf45a6a
--- /dev/null
+++ b/missions/contrib/git_config/git_config.idx
@@ -0,0 +1,2 @@
+01_createGHacc
+02_configGitID
diff --git a/missions/contrib/git_intro/01_gitclone/_auto.sh b/missions/contrib/git_intro/01_gitclone/_auto.sh
new file mode 100644
index 000000000..3f24ca772
--- /dev/null
+++ b/missions/contrib/git_intro/01_gitclone/_auto.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
diff --git a/missions/contrib/git_intro/01_gitclone/_clean.sh b/missions/contrib/git_intro/01_gitclone/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_intro/01_gitclone/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_intro/01_gitclone/_test.sh b/missions/contrib/git_intro/01_gitclone/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_intro/01_gitclone/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_intro/01_gitclone/_treasure-msg.txt b/missions/contrib/git_intro/01_gitclone/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_intro/01_gitclone/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_intro/01_gitclone/_treasure.sh b/missions/contrib/git_intro/01_gitclone/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_intro/01_gitclone/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_intro/01_gitclone/check.sh b/missions/contrib/git_intro/01_gitclone/check.sh
new file mode 100644
index 000000000..837591835
--- /dev/null
+++ b/missions/contrib/git_intro/01_gitclone/check.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  # verifier que le repertoire existe et est un depot git
+
+  if [ ! -d $GSH_HOME/Castle/Portals/celestial ]
+    then 
+      echo " The repository  celestial doesn't exist"
+      return 1
+    else
+    echo " The repository  celestial  exist"
+    fi
+
+  if [ ! -d $GSH_HOME/Castle/Portals/celestial/.git ]
+    then 
+      echo " The repository  celestial is not a git repository"
+      return 1
+    else
+    echo " The repository  celestial is  a git repository "
+    fi
+    
+    
+    return 0 
+}
+_mission_check
diff --git a/missions/contrib/git_intro/01_gitclone/goal.txt b/missions/contrib/git_intro/01_gitclone/goal.txt
new file mode 100644
index 000000000..baa7982eb
--- /dev/null
+++ b/missions/contrib/git_intro/01_gitclone/goal.txt
@@ -0,0 +1,37 @@
+Mission goal
+============
+
+The Head of the magic council has sent an emmissary to your castle with an urgent request.
+
+
+The emmissary explains the following to you:
+"The magic council has realised that too many spells are saved on books. Those can get lost or dammaged over time and the history of how those spells have been crafted and by who is also missing."
+"In addition, some castles and libraries can be far away from each others, and shared access to physical libraries is complicated nowadays"
+"Using a intermendisonal magic, the magic council has developed a way to save history, store and share spells worldwide: the magic library tubes"
+"As a wizard, you need to learn the usage of intermendisonal magic immediatly to contribute to the global effort."
+
+
+As you agree to the suggestion of the magic council, the emmissary gives you your first learning assignement:
+
+"The first step in learning interdimensional magic, is to import the famous book: "Intermendisonal magic for Dummies""
+
+
+------------------------
+
+
+Git is a version manager software. This can Help you to share codes, tex files, or even host websites.
+
+Usually, you have acces to a remote server (github or gitlab for instance) where a code is stored.
+
+
+First, you need to create a new repository called celestial in the Portals room
+
+then use 
+
+git clone https://github.com/MKessar/learning_git.git ./celestial
+
+This will create a local copy of the distant repository "learning_git" into .celestial
+
+
+
+
diff --git a/missions/contrib/git_intro/01_gitclone/init.sh b/missions/contrib/git_intro/01_gitclone/init.sh
new file mode 100644
index 000000000..ca7485185
--- /dev/null
+++ b/missions/contrib/git_intro/01_gitclone/init.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  # ...
+  mkdir -p $GSH_HOME/Castle/Portals/
+  if ! git --version > /dev/null 2 > /dev/null
+    then  echo "git not found"
+    return 1
+  fi
+  
+  
+}
+_mission_init
diff --git a/missions/contrib/git_intro/01_gitclone/static.sh b/missions/contrib/git_intro/01_gitclone/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_intro/01_gitclone/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_intro/02_evince/_auto.sh b/missions/contrib/git_intro/02_evince/_auto.sh
new file mode 100644
index 000000000..3f24ca772
--- /dev/null
+++ b/missions/contrib/git_intro/02_evince/_auto.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
diff --git a/missions/contrib/git_intro/02_evince/_clean.sh b/missions/contrib/git_intro/02_evince/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/git_intro/02_evince/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/git_intro/02_evince/_test.sh b/missions/contrib/git_intro/02_evince/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/git_intro/02_evince/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_intro/02_evince/_treasure-msg.txt b/missions/contrib/git_intro/02_evince/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/git_intro/02_evince/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/git_intro/02_evince/_treasure.sh b/missions/contrib/git_intro/02_evince/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/git_intro/02_evince/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/git_intro/02_evince/check.sh b/missions/contrib/git_intro/02_evince/check.sh
new file mode 100644
index 000000000..ae6bfd929
--- /dev/null
+++ b/missions/contrib/git_intro/02_evince/check.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+
+  printf "%s " "$(gettext "Please cast the spell you found on the scroll")"
+  read -r r
+
+  if [ "$r" != "42" ]
+  then
+    echo "$(gettext "That's not the correct spell! Please read the scroll again")"
+    return 1
+  fi
+
+#   if [ -t 0 ]
+#   then
+#     # got input interactively from a tty
+#     echo "$(gettext "That's correct, but you need to use a redirection to complete this mission!")"
+#     return 1
+#   fi
+#   return 0
+    
+    return 0 
+}
+_mission_check
diff --git a/missions/contrib/git_intro/02_evince/goal.txt b/missions/contrib/git_intro/02_evince/goal.txt
new file mode 100644
index 000000000..0ab7c3bf5
--- /dev/null
+++ b/missions/contrib/git_intro/02_evince/goal.txt
@@ -0,0 +1,30 @@
+Mission goal
+============
+
+
+You realise now that the spellbook is actually a bunch of scrolls poorly tied to each other.
+
+Clearly, the magic council was in a hurry when they wrapped this.
+
+After asking the emmissary about it, they replied that a lot of the spellbooks found in the interdimensional libraires are still under devellopement, and it is quite common to find ongoing projects and even dropped ones.
+
+As a warm up, the emmissary ask you to cast the spell on the Enchanted_Scroll.
+
+
+
+Usefull comandes:
+
+evince Enchanted_Scroll.pdf
+
+
+gsh check
+
+
+
+
+
+
+
+
+
+
diff --git a/missions/contrib/git_intro/02_evince/init.sh b/missions/contrib/git_intro/02_evince/init.sh
new file mode 100644
index 000000000..ca7485185
--- /dev/null
+++ b/missions/contrib/git_intro/02_evince/init.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  # ...
+  mkdir -p $GSH_HOME/Castle/Portals/
+  if ! git --version > /dev/null 2 > /dev/null
+    then  echo "git not found"
+    return 1
+  fi
+  
+  
+}
+_mission_init
diff --git a/missions/contrib/git_intro/02_evince/static.sh b/missions/contrib/git_intro/02_evince/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/git_intro/02_evince/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/git_intro/git_intro.idx b/missions/contrib/git_intro/git_intro.idx
new file mode 100644
index 000000000..8358fb259
--- /dev/null
+++ b/missions/contrib/git_intro/git_intro.idx
@@ -0,0 +1,2 @@
+01_gitclone
+02_evince
diff --git a/missions/contrib/github_branches/git.idx b/missions/contrib/github_branches/git.idx
new file mode 100644
index 000000000..9048152ac
--- /dev/null
+++ b/missions/contrib/github_branches/git.idx
@@ -0,0 +1,5 @@
+git01
+git02
+git03
+git04
+git05
diff --git a/missions/contrib/github_branches/git01/.goal.txt.kate-swp b/missions/contrib/github_branches/git01/.goal.txt.kate-swp
new file mode 100644
index 000000000..7449de3ae
Binary files /dev/null and b/missions/contrib/github_branches/git01/.goal.txt.kate-swp differ
diff --git a/missions/contrib/github_branches/git01/_auto.sh b/missions/contrib/github_branches/git01/_auto.sh
new file mode 100644
index 000000000..3f24ca772
--- /dev/null
+++ b/missions/contrib/github_branches/git01/_auto.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
diff --git a/missions/contrib/github_branches/git01/_clean.sh b/missions/contrib/github_branches/git01/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/github_branches/git01/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/github_branches/git01/_test.sh b/missions/contrib/github_branches/git01/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/github_branches/git01/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/github_branches/git01/_treasure-msg.txt b/missions/contrib/github_branches/git01/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/github_branches/git01/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/github_branches/git01/_treasure.sh b/missions/contrib/github_branches/git01/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/github_branches/git01/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/github_branches/git01/check.sh b/missions/contrib/github_branches/git01/check.sh
new file mode 100644
index 000000000..fb6bae75c
--- /dev/null
+++ b/missions/contrib/github_branches/git01/check.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+  # verifier que le repertoire existe et est un depot git
+
+echo "No proper check implemented yet, so we are assuming you did it right ;)"
+    return 0
+
+    
+}
+_mission_check
diff --git a/missions/contrib/github_branches/git01/goal.txt b/missions/contrib/github_branches/git01/goal.txt
new file mode 100644
index 000000000..46ab82c87
--- /dev/null
+++ b/missions/contrib/github_branches/git01/goal.txt
@@ -0,0 +1,32 @@
+Mission goal
+============
+
+
+Branches are usefull when dealing with multiple project on the same git repository.
+
+If you are trying to implement a new model, or work on the optimisation of your code, you might need a separate branch for those.
+
+in addition, if you have a stable version of your code, and you need to try something sketchy, a develloping branch is critical.
+
+You can merge the modification of a branch into the main branch when you are happy with the modifications.
+
+
+
+First, let's create a new branch in the ProUser folder, and send it to the github repo.
+
+
+
+
+
+
+Useful commands
+===============
+
+git checkout -b dev
+
+#creates a branch called "dev"
+
+
+git push origin dev
+
+#sends your local branch to the server
diff --git a/missions/contrib/github_branches/git01/init.sh b/missions/contrib/github_branches/git01/init.sh
new file mode 100644
index 000000000..ca7485185
--- /dev/null
+++ b/missions/contrib/github_branches/git01/init.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  # ...
+  mkdir -p $GSH_HOME/Castle/Portals/
+  if ! git --version > /dev/null 2 > /dev/null
+    then  echo "git not found"
+    return 1
+  fi
+  
+  
+}
+_mission_init
diff --git a/missions/contrib/github_branches/git01/static.sh b/missions/contrib/github_branches/git01/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/github_branches/git01/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/github_branches/git02/_auto.sh b/missions/contrib/github_branches/git02/_auto.sh
new file mode 100644
index 000000000..3f24ca772
--- /dev/null
+++ b/missions/contrib/github_branches/git02/_auto.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
diff --git a/missions/contrib/github_branches/git02/_clean.sh b/missions/contrib/github_branches/git02/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/github_branches/git02/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/github_branches/git02/_test.sh b/missions/contrib/github_branches/git02/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/github_branches/git02/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/github_branches/git02/_treasure-msg.txt b/missions/contrib/github_branches/git02/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/github_branches/git02/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/github_branches/git02/_treasure.sh b/missions/contrib/github_branches/git02/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/github_branches/git02/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/github_branches/git02/check.sh b/missions/contrib/github_branches/git02/check.sh
new file mode 100644
index 000000000..fb98d51c2
--- /dev/null
+++ b/missions/contrib/github_branches/git02/check.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+echo "No proper check implemented yet, so we are assuming you did it right ;)"
+    return 0
+
+}
+_mission_check
diff --git a/missions/contrib/github_branches/git02/goal.txt b/missions/contrib/github_branches/git02/goal.txt
new file mode 100644
index 000000000..b23cfe2fc
--- /dev/null
+++ b/missions/contrib/github_branches/git02/goal.txt
@@ -0,0 +1,38 @@
+Mission goal
+============
+
+
+
+Now, let's add a new file called "additional_module.txt" in your ProUser folder,
+
+And modify the previous file (firsname.lastname.txt): Please add a line with your institute'name
+
+Then commit and push everything 
+
+
+
+
+
+
+Useful commands
+===============
+
+
+gedit file.txt
+vi file.txt
+
+git add 
+
+git commit -m "modify test file" file.txt
+
+git commit -m "add  file"
+
+git push
+
+
+You can also you the following commands
+
+git log
+
+
+git status
diff --git a/missions/contrib/github_branches/git02/init.sh b/missions/contrib/github_branches/git02/init.sh
new file mode 100644
index 000000000..ca7485185
--- /dev/null
+++ b/missions/contrib/github_branches/git02/init.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  # ...
+  mkdir -p $GSH_HOME/Castle/Portals/
+  if ! git --version > /dev/null 2 > /dev/null
+    then  echo "git not found"
+    return 1
+  fi
+  
+  
+}
+_mission_init
diff --git a/missions/contrib/github_branches/git02/static.sh b/missions/contrib/github_branches/git02/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/github_branches/git02/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/github_branches/git03/_auto.sh b/missions/contrib/github_branches/git03/_auto.sh
new file mode 100644
index 000000000..3f24ca772
--- /dev/null
+++ b/missions/contrib/github_branches/git03/_auto.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
diff --git a/missions/contrib/github_branches/git03/_clean.sh b/missions/contrib/github_branches/git03/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/github_branches/git03/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/github_branches/git03/_test.sh b/missions/contrib/github_branches/git03/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/github_branches/git03/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/github_branches/git03/_treasure-msg.txt b/missions/contrib/github_branches/git03/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/github_branches/git03/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/github_branches/git03/_treasure.sh b/missions/contrib/github_branches/git03/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/github_branches/git03/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/github_branches/git03/check.sh b/missions/contrib/github_branches/git03/check.sh
new file mode 100644
index 000000000..fb98d51c2
--- /dev/null
+++ b/missions/contrib/github_branches/git03/check.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+echo "No proper check implemented yet, so we are assuming you did it right ;)"
+    return 0
+
+}
+_mission_check
diff --git a/missions/contrib/github_branches/git03/goal.txt b/missions/contrib/github_branches/git03/goal.txt
new file mode 100644
index 000000000..400a03e07
--- /dev/null
+++ b/missions/contrib/github_branches/git03/goal.txt
@@ -0,0 +1,40 @@
+Mission goal
+============
+
+
+Let's make also make modifications on your master branch in the SmallWeels repository
+
+Modify the previous file (firsname.lastname.txt): Please add a line with the name of a planet of the Solar System.
+
+Then commit and push everything 
+
+
+
+
+
+
+Useful commands
+===============
+
+git pull 
+
+gedit file.txt
+vi file.txt
+
+git add 
+
+git commit -m "modify test file" file.txt
+
+git commit -m "add  file"
+
+git push
+
+
+You can also you the following commands
+
+git log
+
+
+git status
+
+
diff --git a/missions/contrib/github_branches/git03/init.sh b/missions/contrib/github_branches/git03/init.sh
new file mode 100644
index 000000000..ca7485185
--- /dev/null
+++ b/missions/contrib/github_branches/git03/init.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  # ...
+  mkdir -p $GSH_HOME/Castle/Portals/
+  if ! git --version > /dev/null 2 > /dev/null
+    then  echo "git not found"
+    return 1
+  fi
+  
+  
+}
+_mission_init
diff --git a/missions/contrib/github_branches/git03/static.sh b/missions/contrib/github_branches/git03/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/github_branches/git03/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/github_branches/git04/_auto.sh b/missions/contrib/github_branches/git04/_auto.sh
new file mode 100644
index 000000000..3f24ca772
--- /dev/null
+++ b/missions/contrib/github_branches/git04/_auto.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
diff --git a/missions/contrib/github_branches/git04/_clean.sh b/missions/contrib/github_branches/git04/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/github_branches/git04/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/github_branches/git04/_test.sh b/missions/contrib/github_branches/git04/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/github_branches/git04/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/github_branches/git04/_treasure-msg.txt b/missions/contrib/github_branches/git04/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/github_branches/git04/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/github_branches/git04/_treasure.sh b/missions/contrib/github_branches/git04/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/github_branches/git04/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/github_branches/git04/check.sh b/missions/contrib/github_branches/git04/check.sh
new file mode 100644
index 000000000..fb98d51c2
--- /dev/null
+++ b/missions/contrib/github_branches/git04/check.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+echo "No proper check implemented yet, so we are assuming you did it right ;)"
+    return 0
+
+}
+_mission_check
diff --git a/missions/contrib/github_branches/git04/goal.txt b/missions/contrib/github_branches/git04/goal.txt
new file mode 100644
index 000000000..8dd0250cf
--- /dev/null
+++ b/missions/contrib/github_branches/git04/goal.txt
@@ -0,0 +1,32 @@
+Mission goal
+============
+
+
+So, you are now done with the modifications on your dev branch, and would like to merge them with your main branch.
+
+
+
+You need to head back to your ProUser folder, set it up to the main branch, merge the mdicfaction from the dev branch, and push everything to the server.
+
+
+
+
+Useful commands
+===============
+
+git pull 
+
+
+git checkout main # sets your local git deposit to the main branch
+
+git merge Toto : merges the modifications from the branch "Toto"  to your current branch 
+
+
+
+
+
+Remarks:
+
+THe folowing be usefull:
+
+https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts
diff --git a/missions/contrib/github_branches/git04/init.sh b/missions/contrib/github_branches/git04/init.sh
new file mode 100644
index 000000000..ca7485185
--- /dev/null
+++ b/missions/contrib/github_branches/git04/init.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  # ...
+  mkdir -p $GSH_HOME/Castle/Portals/
+  if ! git --version > /dev/null 2 > /dev/null
+    then  echo "git not found"
+    return 1
+  fi
+  
+  
+}
+_mission_init
diff --git a/missions/contrib/github_branches/git04/static.sh b/missions/contrib/github_branches/git04/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/github_branches/git04/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/github_branches/git05/_auto.sh b/missions/contrib/github_branches/git05/_auto.sh
new file mode 100644
index 000000000..3f24ca772
--- /dev/null
+++ b/missions/contrib/github_branches/git05/_auto.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to automatically
+# validate the mission. It should end with a succesful `gsh check` command.
+# It is sometimes possible to "cheat" by using any hidden data in $GSH_TMP,
+# but it is better to do it the "intended" way.
+# If you write this file, rename it to auto.sh
diff --git a/missions/contrib/github_branches/git05/_clean.sh b/missions/contrib/github_branches/git05/_clean.sh
new file mode 100644
index 000000000..b3cec70ae
--- /dev/null
+++ b/missions/contrib/github_branches/git05/_clean.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is used to clean the mission,
+# for example on completion, or when restarting it.
+# In some rare case, cleaning is different after a successful check. You can
+# inspect the variable $GSH_LAST_ACTION, which can take the following values:
+# assert, check_false, check_true, exit, goto, hard_reset, reset, skip
+# If you need this file, rename it to clean.sh
diff --git a/missions/contrib/github_branches/git05/_test.sh b/missions/contrib/github_branches/git05/_test.sh
new file mode 100644
index 000000000..c2e0a2678
--- /dev/null
+++ b/missions/contrib/github_branches/git05/_test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced by the command "gsh test" for
+# testing during development.
+# If you write this file, rename it to 'test.sh'
+#
+# You can use some special commands
+# gsh assert check true
+# gsh assert check false
+# gsh assert CONDITION
+# to check that specific conditions are satisfied.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/github_branches/git05/_treasure-msg.txt b/missions/contrib/github_branches/git05/_treasure-msg.txt
new file mode 100644
index 000000000..72094a5b9
--- /dev/null
+++ b/missions/contrib/github_branches/git05/_treasure-msg.txt
@@ -0,0 +1,3 @@
+This file is not required. When it exists, it is displayed when sourcing 
+the "treasure.sh" file. (If no "treasure.sh" file exists, this file will 
+be ignored.)
diff --git a/missions/contrib/github_branches/git05/_treasure.sh b/missions/contrib/github_branches/git05/_treasure.sh
new file mode 100644
index 000000000..1fa10ce8e
--- /dev/null
+++ b/missions/contrib/github_branches/git05/_treasure.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+
+# This file is not required. When it exists, it is sourced on successfull
+# completion of the mission and is added to the global configuration.
+# It is typically used to "reward" the player with new features like aliases
+# and the like.
+# If you need this file, rename it to 'treasure.txt'
+#
+# Note that should the mission be completed in a subshell, aliases or
+# environment variables will disappear.
+# That typically happens a mission is checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
diff --git a/missions/contrib/github_branches/git05/check.sh b/missions/contrib/github_branches/git05/check.sh
new file mode 100644
index 000000000..fb98d51c2
--- /dev/null
+++ b/missions/contrib/github_branches/git05/check.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env sh
+
+# This file is required. It is sourced when checking the goal of the mission
+# has been achieved.
+# It should end with a command returning 0 on success, and something else on
+# failure.
+# It should "unset" any local variable it has created, and any "global
+# variable" that were only used for the mission. (The function _mission_check
+# is automatically unset.)
+#
+# It typically looks like
+
+_mission_check() {
+
+echo "No proper check implemented yet, so we are assuming you did it right ;)"
+    return 0
+
+}
+_mission_check
diff --git a/missions/contrib/github_branches/git05/goal.txt b/missions/contrib/github_branches/git05/goal.txt
new file mode 100644
index 000000000..b9c112af9
--- /dev/null
+++ b/missions/contrib/github_branches/git05/goal.txt
@@ -0,0 +1,21 @@
+Mission goal
+============
+
+Assuming you do not the dev branch... you might want to delet it ?
+
+
+Delete the dev branch in the ProUser folder and push this to the server.
+
+
+Useful commands
+===============
+
+
+
+
+git branch -d Toto : delets the branch Toto localy
+
+git branch -d Toto : delets the branch Toto localy
+
+
+git push origin –delete Toto
diff --git a/missions/contrib/github_branches/git05/init.sh b/missions/contrib/github_branches/git05/init.sh
new file mode 100644
index 000000000..ca7485185
--- /dev/null
+++ b/missions/contrib/github_branches/git05/init.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced every time the mission is started.
+# Since it is sourced every time the mission is restarted, it can generate
+# random data to make each run slightly different.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
+#
+# Note however that should the mission be initialized in a subshell, those
+# environment variables will disappear! That typically happens a mission is
+# checked using process redirection, as in
+#   $ SOMETHING | gsh check
+# To mitigate the problem, GameShell will display a message asking the player
+# to run
+#   $ gsh reset
+# in that case.
+#
+# It typically looks like
+_mission_init() {
+  # ...
+  mkdir -p $GSH_HOME/Castle/Portals/
+  if ! git --version > /dev/null 2 > /dev/null
+    then  echo "git not found"
+    return 1
+  fi
+  
+  
+}
+_mission_init
diff --git a/missions/contrib/github_branches/git05/static.sh b/missions/contrib/github_branches/git05/static.sh
new file mode 100644
index 000000000..ec01a82da
--- /dev/null
+++ b/missions/contrib/github_branches/git05/static.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+# This file is not required: it is sourced once when initialising a GameShell
+# game, and whenever the corresponding missions is (re)started.
+# It typically creates the parts of the mission that will be available during
+# the whole game, like the directory structure.
+#
+# Since it is sourced, it may define environment variables if you really need
+# them, but it should "unset" any local variable it has created.
diff --git a/missions/contrib/index_git_roadmap.txt b/missions/contrib/index_git_roadmap.txt
new file mode 100644
index 000000000..5176dee71
--- /dev/null
+++ b/missions/contrib/index_git_roadmap.txt
@@ -0,0 +1,175 @@
+For each mission, is everything implemented properly ?
+
+init:
+goal:
+LORE:
+static:
+check:  
+
+v: yes
+x: no
+NA: not appliable
+
+------------------------------
+Section I) git_Intro
+
+I.1) gitclone
+init:v 
+goal:almost
+LORE:in progess
+static: 
+check: in progress
+
+
+I.2) evince
+init:x
+goal: need clening
+LORE: x
+static: -
+check: x
+
+
+
+
+Section II: git_config
+II.1) createGHacc
+init:x
+goal:v
+LORE:x
+static:-
+check: in progress
+
+
+
+II.2) configGitID
+init:x
+goal:v
+LORE:x
+static:
+check: in progress
+
+
+Section III: git_basics
+
+III.1)create_newrepo
+init:
+goal:
+LORE:
+static:
+check:
+
+III.2)add_newSpell
+init:
+goal:
+LORE:
+static:
+check:
+
+III.3)git_log
+init:
+goal:
+LORE:
+static:
+check:
+
+
+III.4)git_edit_status
+init:
+goal:
+LORE:
+static:
+check:
+
+III.5)git_edit_diff
+init:
+goal:
+LORE:
+static:
+check:
+
+III.6)git_edit_add_diff_stage
+init:
+goal:
+LORE:
+static:
+check:
+
+
+III.7)git_edit_commit
+init:
+goal:
+LORE:
+static:
+check:
+
+III.8)git_edit_push
+init:
+goal:
+LORE:
+static:
+check:
+
+
+
+
+III.9)git_edit_commit_push
+without stage
+init:
+goal:
+LORE:
+static:
+check:
+
+
+III.10)git_add_Folder
+init:
+goal:
+LORE:
+static:
+check:
+
+III.11)git_mv
+init:
+goal:
+LORE:
+static:
+check:
+
+III.12)git_rm
+init:
+goal:
+LORE:
+static:
+check:
+
+
+
+
+Section IV: git_config_advanced
+IV.1)
+IV.2)
+
+
+
+Section V: github_branches
+V.1)
+V.2)
+...
+
+Section VI: git_forks
+VI.1)
+...
+
+
+Section VII: git_beyond
+
+VII.1) link to outside documentation ressources
+
+
+
+
+
+
+
+  index_git_roadmap.txt
+
diff --git a/missions/default.idx b/missions/default.idx
index 5fe59affd..76765f2da 100644
--- a/missions/default.idx
+++ b/missions/default.idx
@@ -1,5 +1,4 @@
 # default Gameshell missions order
-
   basic/default.idx
   misc/01_cal_nostradamus
   intermediate/01_alias_la
@@ -9,7 +8,7 @@
   intermediate/04_bg_xeyes
   intermediate/05_background
   intermediate/06_control-C
- !finding_files_maze/00_shared
+  finding_files_maze/00_shared
   finding_files_maze/01_ls_cd
   finding_files_maze/02_tree
   finding_files_maze/03_find_1
diff --git a/missions/gameshell_basic.idx b/missions/gameshell_basic.idx
new file mode 100644
index 000000000..2ee6d837a
--- /dev/null
+++ b/missions/gameshell_basic.idx
@@ -0,0 +1,3 @@
+# Git basics missions order
+  contrib/git_basics.idx
+  FINAL_MISSION
diff --git a/missions/gameshell_branching.idx b/missions/gameshell_branching.idx
new file mode 100644
index 000000000..f34ddf174
--- /dev/null
+++ b/missions/gameshell_branching.idx
@@ -0,0 +1,2 @@
+  contrib/git_branching.idx
+  FINAL_MISSION
diff --git a/new_plan.txt b/new_plan.txt
new file mode 100644
index 000000000..2248f5959
--- /dev/null
+++ b/new_plan.txt
@@ -0,0 +1,96 @@
+
+
+
+## git intro
+1: git clone of documentation
+2: evince doc.pdf
+
+
+## git config (MK)
+1. Create login account (Former Contrib/git03)
+2. config name in git => get the wand (github_basics/git02)
+
+## git basics  (MK)
+1. create new repo + clone (github_basics/git01)
+2. craft new spell + add + commit +push (github_basics/git03) (github_basics/git05) (github_basics/git06 folder) 
+3. git log (github_basics/git08) ex: git log --pretty=oneline | head -n 10
+4. modify spell + git status
+5. git diff
+6. add + diff => --staged
+7. git commit (github_basics/git05)
+7. git mv + push (github_basics/git04) 
+8. git rm  + push (github_basics/git07) 
+
+
+
+
+## git config advanced  (MK)
+1. config ssh => get the two rings (github_ssh_key/git01) 
+2(optionel). lien vers de la doc (URL) pour config multiple name in git => get multiple  wand (si on a le temps) firefox URL
+
+
+## git advanced (MH)
+3. git revert 
+
+
+---------------
+Début de la bataille contre le dragon.
+
+## git branching (MH)
+1. clone al far repo 
+2. cd inside it and create local branches
+2a. add questions on Fast forward and real merge
+3. Merge FF on main from existing branch
+4. Create branch power + contrib  + commit
+5. back on main + merge from existing branch (no conflict)
+5a. checkout a previous commit and back most recent commit to explore the content of the spell
+6. merge power branch (conflict)
+7. delete all branches power, new_ingredient and add_rune
+8. add remote portal Al Jeit
+9. merge existing branch (conflict)
+10. Explore history and recover ancient technique. Implement it in the latest version of the spell => kill the dragon but it resurrects
+
+
+## git forking (MH)
+3. Fork repo with initial content and some branches + contribution with a new spell (no conflict)
+4. Fork repo with initial content and some branches + contribution with spell modification (with conflict)
+5. final 1: everybody needs to contribute to craft a spell powerful enough
+6. final 2: prime numbres and pi digits required to make it even more powerful
+
+
+## Lore
+
+TODO: Intro
+
+github/gitlab => bibliothèque
+un dépot => un portail, une sorte de livre 
+un fichier => un sort
+
+la puissance des sorts dépend de leur version et donc un diff est suffisant dans le check
+
+### git branching
+- récuperer un dépot distant avec le sort dragon_killer réparti en plusieurs branches 
+- ajouter un remote qui contient un sort d'amplicfication lui aussi réparti en plusieurs branches fusionner
+
+
+### git forking
+Travail collaboratif
+2-4 étudiants sur un seul dépot.
+
+chaque étudiant n'a accès qu'à un des sorts suivant sur des dépôts séparés :  
+- diminution de la résitance à la magie => harry potter,  Albus Dumbledore, Lord Voldemort, Hogwarts 
+- poison => The Chronicles of Narnia, Jadis,  king beyond the seas, Cair Paravel, 
+- blocage de la régénération de vie => Sorceleur, Yennefer de Vengerberg, Ciri, ville Novigrad 
+- sort d'artilelrie: lancer le sort 1000 fois d'un coup: caput le dragon => Eona, Eona, Sire Ido, Palais de Kygo
+
+- création du fork et du remote en local pointant sur le fork
+- création des remotes liés aux amélioration dont il a la charge + création des branches locales
+- fusion branches locales dans spell et push dans le fork
+- fusion des forks via l'interface web + MAJ local
+
+
+
+le merge des branches des deux étudiants donne le sort final
+
+
+