Hi Guys,
I am building a food delivery application. And there are multiple developers working on it.
The major issue is that someone recently merge his code into main and it looks good.
But when I am trying to merge my branch into that. It shows resolve conflicts and when I tap on resolve conflicts button on top right corner.
It just stuck there. Nothing happens for an hour or so. And then when I close the tab or close the desktop app and come back again it takes me to the merge screen again and again the same behavior.
Sometimes, support team is really slow.
Please someone help me to resolve this issue.
Thanks