我正在尝试将我的Git master分支重置为旧版本。我做了一个分支来保存主分支的更改,然后进行了重置。现在我被困住了,现在不做什么。状态消息告诉我可以快速转发分支,但是我想提交更改以恢复到旧版本。 Master也已经推送到git服务器。接下来我该怎么办?
User MINGW64 application (feature/logBusiness)
$ git checkout master
M .classpath
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
User MINGW64 application (master)
$ git checkout -b feature/v5.3.10
M .classpath
Switched to a new branch 'feature/v5.3.10'
User MINGW64 application (feature/v5.3.10)
$ git push -u origin feature/v5.3.10
Enter passphrase for key '/c/Users/user/.ssh/id_rsa':
Total 0 (delta 0), reused 0 (delta 0)
To ssh://git@gitserver/srv/git/application
* [new branch] feature/v5.3.10 -> feature/v5.3.10
Branch feature/v5.3.10 set up to track remote branch feature/v5.3.10 from origin.
User MINGW64 application (feature/v5.3.10)
$ git checkout master
M .classpath
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
User MINGW64 application (master)
$ git reset --hard RM2_5.3.8_alpha
HEAD is now at 2055fa8 Fixed bug when KPi has no database connection assigned
User MINGW64 application (master)
$ git status
On branch master
Your branch is behind 'origin/master' by 54 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working directory clean
要更新远程存储库,请在本地git push -f
分支上运行master
。这将覆盖远程master
分支,用您的本地版本替换。
通常,您仅应在您是其独占用户的分支上执行此操作。如果其他人共享远程master
分支,则像这样覆盖它,将使他们很难基于master
分支的旧值合并任何更改。