Merge conflict detected, telling to type same cmd again x2 but no way out

  1. Describe the issue briefly
    merge conflict detected, "Do you know what a merge conflict is, and how one can resolve it ? [y/n]: y
    Try running git commit -m ME_QEATS_REVIEW_MP_MODULE_TAG_SUGGESTION again once all merge conflicts have been removed
    "
  2. 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)
    more than 120 mins
  3. What is your hypothesis?

Read this blog.


It helped me.

1 Like

it isn’t giving me any type of conflicts or automerges, therefore can’t proceed according to video

2 Likes

But The screenshot is showing there is a conflict in access_token.sh file

1 Like

there were some other errors, thanku

1 Like