From 66e485f5aef4475945efde769fc1cc38d56f961e Mon Sep 17 00:00:00 2001
From: fpellet <git@florentpellet.com>
Date: Sun, 17 Sep 2023 16:33:50 +0200
Subject: [PATCH] Not edit message on next command

---
 run     | 4 ++--
 run.ps1 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/run b/run
index 9aa1a970..5af38f4e 100755
--- a/run
+++ b/run
@@ -172,7 +172,7 @@ function addStepNavigationCommand(){
 git add -A
 git commit -m "Abort test"
 git checkout -b ${workshopBranch}-${tag} ${tag}
-git merge ${tag}-test1 > /dev/null
+git merge --no-edit ${tag}-test1 > /dev/null
 git checkout --ours .
 git add .
 git commit -m "Merge with test branch"
@@ -267,7 +267,7 @@ function addNavigationCommand(){
  
 git add -A
 git commit -m "Resolve test"
-git merge $tag
+git merge --no-edit $tag
 EOF
   
   if [ $testNum -eq 1 ]
diff --git a/run.ps1 b/run.ps1
index 9c24d0ee..0ac38802 100644
--- a/run.ps1
+++ b/run.ps1
@@ -15,14 +15,14 @@ PowerShell -ExecutionPolicy Bypass -File @@scriptname@@.ps1
 $nextCommandTemplate = @"
 git add -A 
 git commit -m "Resolve test"
-git merge @@nexttag@@
+git merge --no-edit @@nexttag@@
 "@
 
 $jumpToNextStepCommandTemplate = @"
 git add -A
 git commit -m "Abort test"
 git checkout -b $workshopBranch-@@nexttag@@ @@nexttag@@ 
-git merge @@nexttag@@-test1 *> `$null`
+git merge --no-edit @@nexttag@@-test1 *> `$null`
 git checkout --ours . 
 git add . 
 git commit -m "Merge with test branch"