I had a merge conflict problem in git. This problem happened when two people were making the same modifications to the same file. The first person did the commit and I went to make another commit after her. Git refused and I tried three more times. On the fourth time git left the commit, but the web system had a broken part.
So I did a revert in a commit that was working and after that, I performed a checkout for the same commit that was working. But now when I give git push, it appears that the directory is empty and has nothing to upload.
Does anyone have a solution for the repository to re-run normally? Thanks.