Error in conflict

  1. Describe the issue briefly
    Even after hard resetting, getting an error upon commit,
    please help
    error: Committing is not possible because you have unmerged files.
    hint: Fix them up in the work tree, and then use 'git add/rm ’
    hint: as appropriate to mark resolution and make a commit.
    fatal: Exiting because of an unresolved conflict.

  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 2hours

  3. What is your hypothesis?

@rahul2309 See “hard resetting” will not help you, if you’ve merge conflicts, there is totally a separate procedure for dealing and tackling with merge conflicts.

It was given in the milestones docs but it looks like you haven’t gone through it.

Follow this link to resolve this issue: see this

All the best.