Can'；t推送到Github非快进错误

我在一个网站上工作，我正在使用React create应用程序及其网页配置。我一直在推动Github回购，没有任何问题。几天前，我把我正在制作的站点变成了一个GithubPages站点（即mygithubname.Github.io）

---

将此回购转换为Github Pages站点后，我的项目回购的结构发生了变化。看起来它最小化了代码，以便将其放到网上。一旦我推动了这一回购协议，并使其成为一个实时Github页面网站，我突然无法再推动回购协议了

如果我推动回购，我会得到一个错误：

! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/Nicknyr/New_Portfolio.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

我在网上做了一些搜索，并尝试使用

git-pull-origin-master

来纠正这个问题。如果我尝试这样做，它会删除我项目的75%，并且我的大部分组件都会丢失。这是git pull origin master的结果：

git pull origin master
From https://github.com/Nicknyr/New_Portfolio
 * branch            master     -> FETCH_HEAD
Removing yarn.lock
CONFLICT (modify/delete): src/styles/_Projects.scss deleted in 5977716b3eb3a9424a9efdbf835a0a2ae9cf6f88 and modified in HEAD. Version HEAD of src/styles/_Projects.scss left in tree.
CONFLICT (modify/delete): src/styles/_Info.scss deleted in 5977716b3eb3a9424a9efdbf835a0a2ae9cf6f88 and modified in HEAD. Version HEAD of src/styles/_Info.scss left in tree.
Removing src/styles/_Header.scss
CONFLICT (modify/delete): src/styles/_Global.scss deleted in 5977716b3eb3a9424a9efdbf835a0a2ae9cf6f88 and modified in HEAD. Version HEAD of src/styles/_Global.scss left in tree.
Removing src/styles/_Footer.scss
Removing src/styles/_ContactForm.scss
Removing src/styles/_Contact.scss
Removing src/registerServiceWorker.js
Removing src/logo.svg
Removing src/index.js
Removing src/index.css
Removing src/images/tic-tac-toe-medium.png
Removing src/images/steem-medium.png
Removing src/images/resume-new.png
Removing src/images/resume-medium.png
Removing src/images/redo.png
Removing src/images/pomodoro-small.png
Removing src/images/placeholder.png
Removing src/images/nodes-no-color.jpg
Removing src/images/name-logo.png
Removing src/images/name-logo-small.png
Removing src/images/euro-small.png
Removing src/images/euro-large.png
Removing src/images/euro-250.png
Removing src/images/centered.png
Removing src/images/blue-nodes-opacity.jpg
Removing src/images/background-2462434_1920.jpg
CONFLICT (modify/delete): src/Projects.js deleted in 5977716b3eb3a9424a9efdbf835a0a2ae9cf6f88 and modified in HEAD. Version HEAD of src/Projects.js left in tree.
Removing src/NodeMailer.js
CONFLICT (modify/delete): src/Menu.js deleted in 5977716b3eb3a9424a9efdbf835a0a2ae9cf6f88 and modified in HEAD. Version HEAD of src/Menu.js left in tree.
Removing src/Info.js
CONFLICT (modify/delete): src/Header.js deleted in 5977716b3eb3a9424a9efdbf835a0a2ae9cf6f88 and modified in HEAD. Version HEAD of src/Header.js left in tree.
Removing src/Footer.js
Removing src/ContactForm.js
CONFLICT (modify/delete): src/Contact.js deleted in 5977716b3eb3a9424a9efdbf835a0a2ae9cf6f88 and modified in HEAD. Version HEAD of src/Contact.js left in tree.
Removing src/App.test.js
Removing src/App.scss
CONFLICT (modify/delete): src/App.js deleted in 5977716b3eb3a9424a9efdbf835a0a2ae9cf6f88 and modified in HEAD. Version HEAD of src/App.js left in tree.
CONFLICT (modify/delete): src/App.css deleted in 5977716b3eb3a9424a9efdbf835a0a2ae9cf6f88 and modified in HEAD. Version HEAD of src/App.css left in tree.
Removing public/index.html
CONFLICT (modify/delete): package.json deleted in 5977716b3eb3a9424a9efdbf835a0a2ae9cf6f88 and modified in HEAD. Version HEAD of package.json left in tree.
Removing README.md
Removing .gitignore
Automatic merge failed; fix conflicts and then commit the result.

它删除了我的大部分项目。我通过git reset--hard解开了这个。我得到了我的项目文件，但我仍然无法推到Github

在将我的站点变成Github页面站点之后。正如您所见，它删除了我的大部分项目，这似乎是我在转到git pull origin master时恢复到的内容

---

我该如何解决这个问题？我想让我的分支机构走上正轨，这样我就可以继续推进它，而不会丢失所有这些文件。

请确认您提交了文件或目录

git add .

或文件/目录名而不是“”

---

此外，您还需要确保您没有落后于已经推出的代码。如果是这样的话，这个错误就会出现

我一直在这样做。问题是我电脑上的本地文件与回购协议不匹配。但是当我拉它的时候，它会删除我的很多文件。事实上，

git add.

可能是OP出现问题的原因。这当然不是一个解决办法。这是一种反模式，使您更容易不知道自己在做什么。添加显式要提交的文件（或块），使用git diff--cached进行验证，然后提交要提交的更改。然后再次检查您的差异，以确保安全。如果你正在推送和创建一个PR，花十秒钟来查看PR的差异。你有责任知道你正在提交和合并什么。“看起来它最小化了代码，以便将其放到网上。”-看起来是什么最小化了代码？您是如何“将此回购协议转变为Github页面站点”的？你到底做了什么？我把回购协议的名字改成了我的Github用户名。我以前有另一个使用我的用户名的回购协议。这可能是我问题的根源吗？推到Github后，我的回购协议的结构发生了变化。您刚刚更改了Github回购协议的名称？这实际上不会对存储库的结构造成任何更改。我相信对文件夹结构所做的更改与将其更改为Github Pages站点有关。这不是它的工作方式。仅仅是一个GitHub页面站点对文件的结构没有任何影响。根据您对精简代码的评论，听起来您运行了一些精简过程，提交了这些文件，然后推送到了新的回购协议（根据您对其他代码之前存在的评论，可能使用

--force

或

--force with lease

）。GitHub页面对源文件没有任何作用。

git commit --all

git push origin master