VS Code merge handler view changed to show incoming/outgoing changes?

Question

I use VS Code to handle most my code and to manage branches with GitHub and generally it works like a charm. However today while trying to merge a branch I didn't get a merge handler that allows me to pick and choose which files I want to push. It staged everything and moved it into a all changes section which I've never seen before. The main issue is that I can't unstage files I don't want to change. Is there a way to change back to the old merge handler I'm used to?

TLDR: My merge handler changed unprompted and I am unsure how to change it back. Below are pictures of the current and old merge handler.

New:

Old:

Pylorus

Please post the code and html as a text, ant an screenshot. – Antipodes

@toyotaSupra I don't really have any code to post here as this is more of a how to properly use github and vsc question rather then a why isn't my python working question. – Pylorus

Are you merging histories? Then you have no freedom to choose which files to merge and which you don't want to merge. You cannot take a part of the files now, then come back later, merge the history again and take the rest. Git does not work this way. When you merge histories, you get one chance to say "this is the correct state after the two histories are merged". For this reason, when you ask Git to merge histories, it stages all files as best as it can. Review the result and commit it. You don't get to choose parts. – Harmless

@Harmless I'm merging a branch into my production one. I've used github and vsc before fine the issue is I have no idea why the layout has changed. – Pylorus

Answer 1

Pretty sure this is just due to recent updates adding the incoming and outgoing changes feature. In particular see,

• https://code.visualstudio.com/updates/v1_86#_incomingoutgoing-changes-improvements
• https://code.visualstudio.com/updates/v1_85#_source-control

See the scm.showIncomingChanges, scm.showOutgoingChanges, and scm.showChangesSummary settings.

1.92 also added a graph visualization. See https://code.visualstudio.com/updates/v1_92#_incomingoutgoing-changes-graph. You can toggle it with the scm.showHistoryGraph setting.

Contrived

Answer 2

Please uncheck this red highlighted box to remove this bottom view.

1. Open the settings option using Ctrl + , (Windows/Linux) or Cmd + , (macOS)
2. Search for scm: Show History and un-check this default selected coming after latest updates

Pecker

Answer 3

It's the show history graph that shows the diff in commits between local and remote

Cleon

Answer 4

Before:Picture

New: Open settings.json

• Add "scm.showHistoryGraph": false

Elaboration

Your answer could be improved with additional supporting information. Please edit to add further details, such as citations or documentation, so that others can confirm that your answer is correct. You can find more information on how to write good answers in the help center. – Tutorial