git - 如何摆脱 GIT 中的 "REVERTING"

Question

我在我的代码上做错了，我搜索了一些命令来恢复到以前的版本，但事情变得更糟。我不知道该怎么做才能解决这个问题。好吓人~~~

我尝试了很多命令，但不知道使用过的命令是什么
git revert 恢复正常工作状态。在这个阶段，我的代码正在运行，但我怎样才能回到 master 分支？

Now the terminal show: 

zswenjin:~/workspace/project_1 ((f9f01be...)|REVERTING) $ 


That is git log:
    commit f9f01bee8249770135e92dc6bc117c5033d3e349 (HEAD)
    Merge: 2a9bc0a 2bb5f7e
    Author: Louis
    Date:   Wed Aug 29 12:28:23 2018 +0000

        Merge branch 'master' into HEAD

    commit 2a9bc0a2110c1a35ab32504c16208305ee7ac895
    Author: Louis 
    Date:   Wed Aug 29 12:23:00 2018 +0000

        Revert "Revert "user now can edit and update their reviews""

        This reverts commit 37062450a252dcf2f22054e9b094ce97bb60ed6d.

    commit afd7b3a8f0fcbd89577bef1f473d0721138b0b3e
    Author: Louis
    Date:   Wed Aug 29 12:21:40 2018 +0000

        Revert "user now can edit and update their reviews"

        This reverts commit 5b7e703aafe1a5d745674eb2350cd4967a9d73a7.

    commit 2bb5f7ee26fff9ec2f8ec3653e87ae30a191e7e4 (github/master, master)
    Author: Louis 
    Date:   Wed Aug 29 11:46:20 2018 +0000

    just commit

    commit 466ce7f711bf38203be829424d960157638e8d4e
    Author: Louis
    Date:   Wed Aug 29 11:44:07 2018 +0000

    Revert "recover from disater"

    This reverts commit 1162459e513425da2ba22a82a7d787fb2cd8da79.



   commit 1162459e513425da2ba22a82a7d787fb2cd8da79
    Author: Louis
    Date:   Wed Aug 29 11:38:00 2018 +0000

        recover from disater

    commit 37062450a252dcf2f22054e9b094ce97bb60ed6d
    Author: Louis 
    Date:   Wed Aug 29 11:35:26 2018 +0000

        Revert "user now can edit and update their reviews"

        This reverts commit 5b7e703aafe1a5d745674eb2350cd4967a9d73a7.

git status 显示:

HEAD detached from 5b7e703
You are currently reverting commit 3706245.
  (fix conflicts and run "git revert --continue")
  (use "git revert --abort" to cancel the revert operation)

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   app/Http/Controllers/ProductController.php
        modified:   database/test.sql
        modified:   resources/views/includes/manufacturer/manufacturerDetail.blade.php
        modified:   resources/views/includes/navBar/navBar.blade.php
        modified:   resources/views/includes/products/productDetail.blade.php
        modified:   resources/views/includes/products/updateProduct.blade.php
        new file:   resources/views/includes/reviews/editReview.blade.php
        modified:   resources/views/reviewDesc.blade.php

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)

        both modified:   routes/web.php

Answer 1

如果你只是想回到主人身边:

您应该能够通过以下方式退出“恢复”状态

git revert --abort

看起来您将处于分离的头部状态。您提供的信息并没有告诉我们您是如何进入该状态的，或者您是否在分离头中进行了任何更改(然后可以存储在无法访问的提交中)。如果是这样，您可能希望在继续之前创建一个分支或标签，以确保这些更改以后可以恢复。

此外，此时您可能想说

git status

查看是否有任何未提交的更改。

一旦你确定你想回到主人，你应该能够

git checkout master

本地未提交的更改可能会干扰这一点，在这种情况下，您必须决定是提交它们、 stash 它们、丢弃它们，还是将 checkout 推迟到您完成上述任一操作后。