Hi i was facing merge conflict problem from few days. I tried to get conflict file from remote i.e theirs . But i was failed to get remote conflict file to edit . So i removed all the files in local and tried to push the empty folder which contains only .git folder files. Its updated in bitbucket but it is not getting updated on remote server aws. Still i was facing merge conflict issue. How can i over come this issue. If anyone know about this issue let me know.Thankks in advance