$ git merge --no-edit master
Auto-merging Gemfile
CONFLICT (content): Merge conflict in Gemfile
Automatic merge failed; fix conflicts and then commit the result.
ほーい
masterむっちゃ進んでますたー!!
<<<<<<< HEAD
ruby '>= 2.4.0', '< 2.8.0'
=======
ruby '>= 2.4.0', '< 3.0.0'
>>>>>>> master