How to resolve merge conflict with git?

5

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.

    
asked by anonymous 28.04.2016 / 22:24

1 answer

2

I managed to resolve. I used the following command git push -f origin: master So my remote branch returns to the desired commit and when I clone the project I will start from that commit.

    
29.04.2016 / 20:57