From bd3837478f86e386790bc7c182b4ea88ddc31aa9 Mon Sep 17 00:00:00 2001 From: Philip Wood <philip.wood@gmail.com> Date: Sat, 20 Mar 2021 22:55:46 +0200 Subject: [PATCH] fix-coffee-branch-incorrectly-drops-baguette It seems that the first commit int the `coffee` branch, drops the changes to the baguette line, causing a failing test in the end since either the baguette isn't eaten, or there are more than 7 commits in the rebased history. This is an !!untested!! suggested fix. --- levels/changing-the-past/rebase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/levels/changing-the-past/rebase b/levels/changing-the-past/rebase index 812737c..9860130 100644 --- a/levels/changing-the-past/rebase +++ b/levels/changing-the-past/rebase @@ -38,7 +38,7 @@ git add . git commit -m "You eat the baguette" git checkout -b coffee -echo "You do not have a baguette. +echo "You ate a baguette. You have coffee.