Hello Team,
We are facing issue while merging code from feature branch to DEV branch. We got conflict issue because same code is merged by other developer but my changes need to go first into PROD. Can you let me know how to resolve this issue and steps to debug the conflict.
Is there any way to reset DEV branch to previous commit? Can you also explain me Merge strategies?
