$ git merge --no-edit master
Removing config/initializers/secureheaders.rb
Auto-merging Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile.lock
Auto-merging Gemfile
Automatic merge failed; fix conflicts and then commit the result.
へいへーい
$ git merge --no-edit master
Removing config/initializers/secureheaders.rb
Auto-merging Gemfile.lock
CONFLICT (content): Merge conflict in Gemfile.lock
Auto-merging Gemfile
Automatic merge failed; fix conflicts and then commit the result.
へいへーい