0

So I've been working on this implementation of Firebase for a while, trying to figure out Kotlin and ended up spending more time than probably suggested for a single commit. When all was set I went a head and committed the changes including making a pull request to look over eventual conflicts and ended up having unsolvable(?) conflicts in files that (obviously) should have been in GitIgnore; As this shows

How do I revert the commit including the pull request so I don't end up deleting any of my work?

Really appreciative for any help I can get!

Vik
  • 143
  • 1
  • 3
  • GitHub tells you what to do: https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-merge-conflicts – Melebius May 13 '20 at 09:26

1 Answers1

0

I think the following steps can help you:

  1. git log by this command you can see the git log.
  2. git checkout <commit hash code> by this one you can back to the stable version you had.

Also simply you can write git revert <commit hash code> just to revert the commit that makes the problem.

Pooya Panahandeh
  • 578
  • 7
  • 21