20
Please help me to revert a git commit (Fixed) (lemmy.ca)
submitted 4 days ago* (last edited 4 days ago) by Crumpled6273@lemmy.ca to c/programming@programming.dev
11 comments fedilink hide all child comments

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.

you are viewing a single comment's thread
view the rest of the comments
[-] Crumpled6273@lemmy.ca 2 points 4 days ago

Yes, I needed to revert back to a commit that done around 2 weeks ago. Approximately 5-6 commits behind.

I fixed the merge conflict by going to the specific file it mentioned which is /app/build/posts.html. And on the code line vscodium suggested me to recover multiple lines of code i previously deleted from the html file. I recovered the deleted lines of code and performed a commit and push.

Now the issue is fixed by using git reset --hard commit_hash which is mentioned by another commenter.

Thank you for trying to help.

this post was submitted on 09 Oct 2026
20 points (88.5% liked)

Programming

28795 readers
163 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Rules

  • Follow the programming.dev instance rules
  • Keep content related to programming in some way
  • If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities !webdev@programming.dev

founded 3 years ago
MODERATORS
snowe@programming.dev
Ategon@programming.dev
UlrikHD@programming.dev
bugsmith@programming.dev
Spyro@programming.dev