I am trying to address merge conflicts, and in some of my files, instead of showing each change as a discrete change where I can accept incoming, accept current change etc… it’s showing the changes as one big block. i.e. when I open VSCODE for certain files, it shows my current changes as all of the current code, and the incoming changes are the entire source file duplicated and presented as one massive change. Essentially it makes it so that I can either accept my file in its entirety or theirs. Why is this happening? It doesn’t happen to all the files. Other files still show each change discretely and give me the option of how to deal with each one.

Has anyone ever seen this?

I tried to search for settings in VScode related to Git merge, but there is no extension for it listed.