From 6eb67dc06b1e7b9b10d71f89c8ace5b6e8bca4a8 Mon Sep 17 00:00:00 2001 From: Norwid Behrnd Date: Sun, 21 Apr 2024 18:39:28 +0200 Subject: [PATCH] fix(merge_squash.rb): explicitly run branch master Signed-off-by: Norwid Behrnd --- levels/merge_squash.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/levels/merge_squash.rb b/levels/merge_squash.rb index d0eb8b04..4eb93e60 100644 --- a/levels/merge_squash.rb +++ b/levels/merge_squash.rb @@ -7,6 +7,7 @@ FileUtils.touch "file1" repo.add "file1" repo.commit_all "First commit" + system "git branch -m master" repo.git.native :checkout, {"b" => true}, 'long-feature-branch' File.open("file3", 'w') { |f| f << "some feature\n" }