Questions tagged [vscode-git]

For questions about using Visual Studio Code GUIs for Git-related operations, may it be doing Git commands via the Source Control UI or the command palette, viewing diffs, resolving merge conflicts, or making commits. For general Git-related questions about the git commands themselves, use the [git] tag instead.

Visual Studio Code comes with a built-in source control management system, and supports Git out-of-the-box as its default SCM provider. See: https://code.visualstudio.com/docs/editor/versioncontrol#_git-support.

As an alternative to using Git from the command line, many of the Git commands can also be done from the Source Control UI, especially since the updates from VS Code 1.48.

VS Code Source Control UI

The same commands can also be done via the command palette.

VS Code Command Palette > Git

There are also GUIs for visualizing certain Git-related operations, such as viewing diffs, resolving merge conflicts, making commits, and for viewing a timeline of changes to a file.

This tag is for questions asking about any of of these features in relation to performing the correct Git commands or operations. Please make sure to clearly describe which parts of the UI or which commands on the Command Palette you are referring to.

For general Git-related questions about using Git from the command line independently from the UI, use the more general . This is because for general Git-related questions, they are most likely unrelated to VS Code itself.

22 questions
0
votes
3 answers

How to make a simple commit into merge commit?

I did the whole thing in VSCode version control. I have two branches, a main and b1 branch. b1 branch came from main branch. After doing some commits on b1, I merged it back into main, but main already got some conflicting commits with that merge. I…
KijeviGombooc
  • 304
  • 2
  • 13
0
votes
1 answer

How to ignore outside libraries git status from source control in VSCode

When using cloned C library which is outside of project workspace, if I look these library's header files by using navigation, VSCode shows library's git status also even if I don't have interest about library's status. This is very annoying for…
Mizunashi
  • 313
  • 1
  • 7
0
votes
0 answers

How to compare files programatically using the vscode 3-ways mergeEditor instead of vscode.diff command?

I have tried to implement this programatically but I can not get it to work. This is my VSCode Version: Version: 1.71.2 (user setup) Commit: 74b1f979648cc44d385a2286793c226e611f59e7 Date: 2022-09-14T21:03:37.738Z Electron: 19.0.12 Chromium:…
0
votes
0 answers

How does vscode do a 2-way diff?

In Why is a 3-way merge advantageous over a 2-way merge?, 3-way merge succeeds 2-way merge because it has a common ancestor as a base to compare, but how does vscode implement its diff algorithm even without this information and just compare the…
tristone
  • 95
  • 6
0
votes
0 answers

VS Code Git Controls in Explorer view

Does somebody know why my git controls are suddenly part of the normal folder view in VS Code? Is this a new VS Code Update. Because it is absolutely attrocious to use. This is a simple example, if you have a bigger codebase, or open multiple…
autarch princeps
  • 170
  • 1
  • 2
  • 11
0
votes
1 answer

How can I delete a keychain password for github and vscode? || Delete Keychain with Terminal

What I am facing the way worked previously deleting a keychain password from UI is not working anymore, simply it doesn't delete or trigger any error messages. STRANGE !! Now I want to delete it using terminal. How can i do that?
Jashan PJ
  • 4,177
  • 4
  • 27
  • 41
-2
votes
1 answer

VS Code can't push to a git repo, but git CLI can

I have cloned a repo via the git CLI like this git clone https://gitlab.myserver.com/myroot/myrepo.git/ Then in VS Code I develop on this repo and I can commit my changes in VS Code. When I now try to push the changes in VS Code I get the following…
halloleo
  • 9,216
  • 13
  • 64
  • 122
1
2