Contents

difficulty 2
description "We have a file in the branch 'feature'; Let's merge it to the master branch"

setup do
      init_from_level
end

solution do
      `ls`.strip().split() == ["file1", "file2"]
end

hint do
      puts "You want to research the `git merge` command"
end

Version data entries

5 entries across 5 versions & 1 rubygems

Version	Path
githug-0.1.7	levels/merge.rb
githug-0.1.6	levels/merge.rb
githug-0.1.5	levels/merge.rb
githug-0.1.4	levels/merge.rb
githug-0.1.3	levels/merge.rb