Describe the issue briefly
I have mistakenly done the wrong merging while solving merge conflict. So, is it possible to undo the commits or I can start the module 2 again.
How much time have you spent debugging this issue?
(Please spend at least 15 minutes to resolve the issue on your own before posting a new topic here)
What is your hypothesis?
Use git reset --hard to revert back to the previous commit and git pull again.
I have done 3-4 commits, it only helps to undo last commit
git reset --hard ‘commit shasum of the commit you want to goto’. Be very careful using this though.
Eg: git reset --hard 94a53423fwxc3saafdwq3
Use git log to find the commit details
Hey, it has been more than 12 hours since we have got a reply from your side. I am closing this query if the problem persists feel free to raise a new query