我做了一个名为'f'的分支并做了一个结账工作.当我尝试git pull命令时收到此消息:
You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
当我尝试时git status,它给了我以下内容:
On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 13 different commit(s) each, respectively.
#
# Changes to be committed:
#
# modified: app/assets/images/backward.png
# modified: app/assets/images/forward.png
# new file: app/assets/images/index_background.jpg
# new file: app/assets/images/loading.gif
# modified: app/assets/images/pause.png
# modified: app/assets/images/play.png
# new file: app/assets/javascripts/jquery-ui-bootstrap.js
# new file: app/assets/stylesheets/jquery-ui-bootstrap.css
# …git ×1