Following a bad commit, I did a hard reset to the previous module, but I can still see the bad commit on the gitlab page and have module 3 files like ModuleThreeTes.java, etc. in the local directory. So, now I am unable to commit and am prompted to resolve the merge conflict, but I don’t know how to. Tried to force push, but apparently not allowed to do so. Please guide me out of this mess.
Even after reverting to the module 2 commit, when I try to setup the remote repository for module 3, I get a fatal error saying that it already exists.
So, probably the problem is when I pull the code stubs for module 3.