用Git覆盖整个项目

用Git覆盖整个项目,git,github,Git,Github,我基本上已经重新编码了一年前的整个项目。与其删除回购协议,我如何才能重新提交,以便仍然保留旧的项目历史?这是我在尝试提交时不断遇到的错误 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 ag

我基本上已经重新编码了一年前的整个项目。与其删除回购协议,我如何才能重新提交,以便仍然保留旧的项目历史?这是我在尝试提交时不断遇到的错误

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日志:

* a7b0452 (HEAD -> master) Entire Refactor
* 64f072c Initialize project using Create React App
* 7b8b043 (origin/dependabot/npm_and_yarn/handlebars-4.5.3) Bump handlebars from 4.1.2 to 4.5.3
* fabab5b (origin/master) Update README.md
* e1de773 Update README.md
* fbee064 added react-router
* efa9634 flexbox
* fc21821 refactored and fixed state issue
* 67f7091 cash-flow statements
* 86f24f0 cashflow + balance sheet
* f9b597f cards
* a7a2bac netlify redirect

我能推荐的最佳解决方案是将新旧项目保持在不同的分支中

git checkout origin/master;
git branch old-master;
git checkout old-master;
git push origin old-master;
git checkout master;
git push origin master -f;

现在您的旧代码在旧主控上,新代码在主控上运行
git fetch--all
,然后运行
git log--all--graph--oneline
,并将输出发送到这里。别担心!这些命令对您的当前状态没有副作用。
*a7b0452(HEAD->master)整个重构\n*64f072c使用Create React App*7b8b043(origin/CORDEROOT/npm_和_WARN/handlebars-4.5.3)初始化项目将把手从4.1.2撞到4.5.3 fabab5b(origin/master)更新README.md\n e1de773更新README.md fbee064添加react路由器efa9634 flexbox fc21821重构和固定状态问题67f7091现金流量表86f24f0现金流量+资产负债表f9b597f卡a7a2bac netlify重定向
这根本不可读!请将其作为更新发送到您的问题中,并请保留缩进,如您在终端中看到的,以便我可以阅读输出。您可以使用代码块在StackOverflowGet中显示它们。更新!