$ git merge --no-edit master
Auto-merging app/presenters/instance_presenter.rb
CONFLICT (content): Merge conflict in app/presenters/instance_presenter.rb
Automatic merge failed; fix conflicts and then commit the result.
キャッシュ長めにしてる変更とコンフリクトしましたー
$ git merge --no-edit master
Auto-merging app/presenters/instance_presenter.rb
CONFLICT (content): Merge conflict in app/presenters/instance_presenter.rb
Automatic merge failed; fix conflicts and then commit the result.
キャッシュ長めにしてる変更とコンフリクトしましたー