Please help me to revert a git commit (Fixed)

6 days ago by tumbling4986 to c/programming

After I type 'git reverse ' in the terminal of vscodium, it always throws this message at me.

Auto-merging app/build/posts.html
CONFLICT (content): Merge conflict in app/build/posts.html
error: could not revert 0cc6763... new blog
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git revert --continue".
hint: You can instead skip this commit with "git revert --skip".
hint: To abort and get back to the state before "git revert",
hint: run "git revert --abort".
hint: Disable this message with "git config advice.mergeConflict false"

Then as the hints say, I type 'git status', fix the error, then commit and push again. But again the same message shows and I have no idea what to do. Getting mad as a beginner.

As i found no useful guides online, please help me to fix this issue without AI.

Solemarc 9 points 6 days ago

I'm not sure what you're trying to do here. But you can probably get out of this state with

git revert --abort

Then your should pull from source again to make sure nothing weird is happening.

After that, if you're trying to rollback to a particular commit the command you probably want is

git reset --hard commit_hash

Which should drop all your local stuff and reset you straight to that commit.

save

path: 0 26239814, hotness: undefined, score: 9, children: 2

Crumpled6273 8 points 6 days ago

git reset --hard commit_hash This worked. Thanks.

save

path: 0 26239814 26240201, hotness: undefined, score: 8, children: 0

z3rOR0ne 3 points 6 days ago

As a jr programmer with constant fish bowl brain, thanks for reminding of this.

save

path: 0 26239814 26239864, hotness: undefined, score: 3, children: 0

Azzu 7 points 5 days ago

git revert does not go back to that commit, it takes the changes that are in that commit and tries to create a new set of changes that are the opposite, i.e. undo the changes of that specific commit.

You could have known that by reading the official documentation of that command, which says essentially the same thing: "Given one or more existing commits, revert the changes that the related patches introduce, and record some new commits that record them." https://git-scm.com/docs/git-revert

Now, if you look at the documentation of git reset, it says "changes which commit HEAD points to. This makes it possible to undo various Git operations, for example commit, merge, rebase, and pull." i.e. this does go back to that commit.

Since revert tries to create new changes, it's of course possible to get conflicts, since you probably changed a bunch since then. If you wanted git revert to work in this case, instead of reverting the commit "you want to go to", you could have reverted all commits since then instead.

So in English, what you did was "try to remove the specific changes within the commit I'm giving you"(git revert) instead of "go back to the commit I'm giving you" (git reset). Next time, try not to get mad and just do a web search, all of those results mention git reset or reverting all commits since then.

save

path: 0 26240814, hotness: undefined, score: 7, children: 0

Maestro 6 points 5 days ago

Happy for you that you fixed it. For future reference, keep this site handy to get help with most git issues:

https://ohshitgit.com/

save

path: 0 26247772, hotness: undefined, score: 6, children: 1

Crumpled6273 2 points 5 days ago

Thanks. Very interesting website.

Actually what is Dangit, Git ? Both looks identical.

save

path: 0 26247772 26249513, hotness: undefined, score: 2, children: 0

hallettj 3 points 5 days ago

Not a direct answer, but I've really been liking jj. You can use it as a friendlier git frontend. It has fewer possible states (for example there are no revert-in-progress, rebase-in-progress, etc., or detached head states); and there is an undo command that really does undo any operation.

save

path: 0 26257012, hotness: undefined, score: 3, children: 0

tal 1 point 6 days ago