Merge conflict not solved

  1. Describe the issue briefly
    I resolved the merge conflict but on commiting it shows exiting because of a conflict

  2. How much time have you spent debugging this issue?
    *30 minutes

  3. What is your hypothesis?

After solving merge conflict do “git add .” and then commit with appropriate message so if there is any mistake further then u can go to previous commit.

Go to the Source Control Icon in the left side of the workspace. Click on that and in the top you’ll see the files in which there is merge conflict(Under Merge Changes heading).

Please see the below video link to understand merge conflicts and how to resolve them.

Let me know if the video was helpful or not.

Closing this topic as there is no response since last 12 hours. Please feel free to create a new topic and post this question as a reference link in the description of the new topic.