Visual Studio Code: Review Merge Changes Side by Side, rather than top down
Is there any way to compare file changes in Visual Studio Code Side By Side, rather than top down? Regular Visual Studio Enterprise has this option.
This is during git merge conflict resolution.
2022: update for VSCode 1.69 (June 2022), as noted in Audwin Oyong's answer, there is now a 3-way merge view, which allows a side-by-side resolution.
In this release, we continued working on the 3-way merge editor.
This feature can be enabled by settinggit.mergeEditortotrueand will be enabled by default in future releases.The merge editor allows you to quickly resolve Git merge conflicts. > When enabled, the merge editor can be opened by clicking on a conflicting file in the Source Control view.
Checkboxes are available to accept and combine changes inTheirsorYours:
And VSCode 1.70 (July 2022) will offer a way to open the regular file (not in 3 way merge mode).
Same as diff editor, it could use an action in the editor title area
See PR 155159 and its new action merge.openResult.
Audwin Oyong adds, based on the release notes:
To turn off the 3-way merge view, you can set
git.mergeEditortofalse.
Open the VSCode settings with Ctrl,:
(From Harshil Patanvadiya's answer)
2021: By default, you see all conflicts "top down", but for each one, clicking on "compare changes" would open a tab with a side-by-side diff.
(from issue 27562)
Not ideal, but a good workaround.
In VSCode 1.71 (Aug. 2022):
Merge Editor: Toggling word wrap should apply to all editors
It was weird when I toggled word wrap in the merge editor yet only the editor I was focused on had it toggled.
I kind of expected all editors to have it toggled.My rationale is that toggling word wrap is usually a symptom of having long lines and the chances that all three editors have long lines is high if a single editor has long lines.
And:
Improve Merge Editor Story For Files Having/Getting Conflict Markers
Originally we had this icon along to toggle between the raw file and merge editor views. Could use it with this new label too.
git-merge felt out of place as an icon choice to my eyes.
- Azure Devops Repos - Revert back to a previous commit like the recent ones never existed
- git is not respecting gitignore instruction to ignore .env files
- How to see contributor's email address on Git commit chain?
- How can I force "git commit -s" using "git commit" command?
- How do I sign out in the Git Bash console in Windows?
- Git checkout - switching back to HEAD
- How to update git commit author, but keep original date when amending?
- Automate sync via git between repo and server, ignoring but not removing files in .gitignore from source
- Merge child branches when parent branch is merged
- husky > pre-commit hook failed (add --no-verify to bypass)
- Git clone fatal
- How do I get the current branch name in Git?
- Can I write a specific rule about how git should handle a specific commonly occurring merge conflict in a specific file?
- How to use Git Revert
- How to show "new" commits in git
- Add SourceTree Remotes Programmatically
- How to create development branch from master on GitHub
- How do I stash only one file out of multiple files that have changed?
- Is it possible to have different Git configuration for different projects?
- Reading environment variables from more than one ".env" file in Python
- Why can't I delete a branch in a remote GitLab repository?
- How to solve "Unable to find git in your PATH" on Flutter?
- git pull for a local repository at specified location (instead of pwd)
- Search string only in added or removed lines using git pickaxe
- Meaning of the GitHub message: push declined due to email privacy restrictions
- Is there a 'git sed' or equivalent?
- Git revert all lines that match a pattern
- Why does `git clone --depth 1` leave packfiles?
- In Gitlab - How can I clone all the repos under a certain organization?
- git update-index --assume-unchanged returns "fatal unable to mark file"