Home / Questions / 41489
Accepted
sioesi
Asked: 2020-12-30 03:04:12 +0800 CST 2020-12-30 03:04:12 +0800 CST

Go back to previous commit

  • 772

I work in a branch called master2, the thing is that I made small changes in 1 file and when I tried to upload them, I made a mistake and git pull origin masterwhen pushI did, almost all the files in the repository with conflict appeared, I tried to solve them but there was no case. I need to go back to the latest stable version of the repository or if it is possible, revert the changes or delete thecommits

EDITION

There are 4 commits after the one you want to go back, can you go back 4 commits before?

git

4 Answers

  1. Best Answer

    You can go back to an old revision by using checkoutand passing the commit hash. For example:

    git checkout ab25f1ln2b4o3a9c4u1v6k4n1m7 .

    Don't forget the period at the end. You can also discard changes by resetpassing the number of commits. For example, to discard the last 3 commits:

    git reset --hard HEAD~3

    The difference between checkoutand resetis that in the latter revisions are discarded , while with checkoutthey are preserved.

    • 32

  2. In your case you probably don't want to keep the changes so:

    git reset --hard HEAD~3

    Or just use the commit id:

    git checkout <id commit>

    If you want to keep the changes and go back 4 commits earlier:

    git reset [--mixed] HEAD~3

    If you only want to move the head to 4 gears before:

    git reset --soft HEAD~3
    • 7

  3. You can go back to the last commit of the branch with git reset --hard(check that you are on the correct branch with git status).

    You can also see your previous commits with git logand choose one of those commits with git checkout codigo_del_commit.

    Unfortunately you will have to search for a stable version of your project using old commits, (git uses commits as save points).

    If you don't save the game and you get killed, you revive at the last save point.

    • 2

  4. to return without using reset (discarding everything you've done in those commits) use

    git revert el-hash-del-commit

    or you can use

    git revert HEAD

    to return 1 commit from the head you are pointing to (you can also use HEAD~2)

    • 0