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.

Would you know to recommend a plugin for VScode for GIT repositories on par with Jetbrains’ IDEs functionality? I use both, and I like both, but missing seamless and user-friendly GIT experience in IDEA when working with VScode. Tried GitLens and other.

In the VS Code git panel
I get a “4, U” colored in red next to the file name.
What does it mean?

I’m connecting remote server via SSH I’m not able to see my changes in source control

I am currently working in VS Code. I write some code, run it, the terminal shows the output, everything is fine. I close VS Code. Now whenever I open VS Code, the output (same output which I ran last time, before closing VS Code) in the terminal has a warning sign. If run the same program again, it creates another section and runs the program. There is no problem while running any program or anything, but that warning sign irritates me. How to remove it?

I have been using Git version control system in cooperation with the VSCode 1.51.0. I have following scenario:

So in vscode I want to open the main branch next to my test branch (like for example another folder view on the other side of the editor).

I need this so it’s easier to copy the already made code (for example if i delete an old page and create a new one with the same name (so i cant just have the old page in the test repo and copy from there)).

I’m using VS Code with git.