This is VS
This is VSCode
I have been wondering if there is any way to recognize the sign of merge conflicts in VS ( like using an extension or configure setting v.v ) like in VSCode and another problem, I am currently facing a merge conflict inside Unity Scene file ( maybe the Unity Scene file is the one that caused the merge editor didn't show up ) and how to solve it automatically?, I have to go through 85670 lines of code to just find these signs? ( Ctrl + F would make my life a little bit easier but still, it is too hard )