git 修改本地文件后的冲突

/ 默认分类 / 没有评论 / 498浏览

chenpingdeMacBook-Pro:android-01 ping$ git pull all fatal: 'all' does not appear to be a git repository fatal: Could not read from remote repository.

Please make sure you have the correct access rights and the repository exists. chenpingdeMacBook-Pro:android-01 ping$ git status On branch master Your branch is ahead of 'origin/master' by 2 commits. (use "git push" to publish your local commits)

nothing to commit, working tree clean chenpingdeMacBook-Pro:android-01 ping$ git branch