there are 3 branches, master, A and B.
I pushed codes of A to remote.
Pushed codes of B to remote.
Now I want to merge B to A. And I have conflicts.
Now while trying to do it, there's Cant merge automatically.
How do I resolve this? I want to do it in vs code coz my code is huge and i dont want any syntax error happening while i resolve.