Merge Conflict not possible

  1. Describe the issue briefly
  • SO i’m still unable to merge conflict. I was only getting conflicts in the facebook_post.py and after clicking on accept current changes, nothing was modified or changed(i think it’s supposed to). Now i can’t commit to github as it says Unmerged Files. Please help or upvote if you have the same issue
  1. 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)
    1 hour
1 Like

@Mann Have you resolved the issue ?

If you didn’t please rollback to your previous commit and do the pull procedure again. For doing the mentioned you can follow this link: https://crio-assist.zendesk.com/hc/en-us/articles/360036055494-How-to-revert-to-an-earlier-state-