テキストを変更してREADME.BASEはブランクだったので削除してしまいましたが、git add README.md、さらにgit commitすると以下のとおりとなり、pushできません。どうすればよいのか全くわかりません。コードの挿入の使い方はこれでよいでしょうか。宜しくお願いします。
` GNU nano 2.5.3 File: /home/ec2-user/environment/.git/COMMIT_EDITMSG
Merge remote-tracking branch 'origin/master'
Conflicts:
README.md
It looks like you may be committing a merge.
If this is not correct, please remove the file
.git/MERGE_HEAD
and try again.
Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
On branch master
All conflicts fixed but you are still merging.
Changes to be committed:
modified: README.md
Changes not staged for commit:
modified: .c9/metadata/environment/hello_app/Gemfile
modified: .c9/metadata/environment/hello_app/app/controllers/application_controller.rb
modified: .c9/metadata/environment/index.php
modified: .c9/metadata/tab0
modified: .c9/metadata/tab1
modified: .c9/metadata/tab2
modified: .c9/metadata/tab5
modified: hello_app/README.md
deleted: heroku/CHANGELOG.md
deleted: heroku/LICENSE
deleted: heroku/README.md
deleted: heroku/bin/heroku
deleted: heroku/bin/heroku.cmd
deleted: heroku/bin/node
deleted: heroku/bin/run
deleted: heroku/lib/analytics.d.ts
deleted: heroku/lib/analytics.js
deleted: heroku/lib/deps.d.ts
deleted: heroku/lib/deps.js
deleted: heroku/lib/file.d.ts
^G Get Help ^O Write Out ^W Where Is ^K Cut Text ^J Justify ^C Cur Pos ^Y Prev Page M-\ First Line M-W WhereIs Next ^^ Mark Text M-} Indent Text M-U Undo ^B Back
^X Exit ^R Read File ^\ Replace ^U Uncut Text ^T To Spell ^_ Go To Line ^V Next Page M-/ Last Line M-] To Bracket M-^ Copy Text M-{ Unindent Text M-E Redo ^F Forward``