After I type ‘git reverse <hash of the commit from github>’ 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.

  • tumbling4986 ( Crumpled6273@lemmy.ca ) OP
    2·
    2 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.