fix(merge.rb): explicitly run branch master

Signed-off-by: Norwid Behrnd <[email protected]>
Gazler · Apr 21, 2024 · 13dfbf7 · 13dfbf7
1 parent 1d34349
commit 13dfbf7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git 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