The task was to resolved the conflict and able to push the changes into the repo. I was able to do that successfully. refer the screenshot.
the task was incomplete with below info
- story-index.txt contains ‘=’. Remove the line that contains ‘====’
It would be good to have the correct error message if my task is wrong. The task does not say anything to remove the lines mentioned in the error message.
I’m happy to redo it if you think its a system error