From 13dfbf7000679d0f97df51b542fc17f3c47ee760 Mon Sep 17 00:00:00 2001 From: Norwid Behrnd Date: Sun, 21 Apr 2024 18:30:16 +0200 Subject: [PATCH] fix(merge.rb): explicitly run branch master Signed-off-by: Norwid Behrnd --- levels/merge.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/levels/merge.rb b/levels/merge.rb index 73cdba38..e84412ff 100644 --- a/levels/merge.rb +++ b/levels/merge.rb @@ -1,12 +1,13 @@ difficulty 2 -description "We have a file in the branch 'feature'; Let's merge it to the master branch." +description "We have a file in the branch 'feature'. Let's merge it with the master branch." setup do - init_from_level + init_from_level + system "git branch -m master" end solution do - File.exists?("file1") && File.exists?("file2") + File.exists?("file1") && File.exists?("file2") end hint do