Day 25 of 100 DevOps Scenario of the Git Merge


I’ve solved this scenario. And, it still gives me an error.

Refer to the screenshot from this solution, it should help you resolve this.