Ecosyste.ms: Awesome
An open API service indexing awesome lists of open source software.
https://github.com/moshfeu/vscode-diff-merge
A vscode extension to merge diffs
https://github.com/moshfeu/vscode-diff-merge
compare merge vscode vscode-extension
Last synced: 1 day ago
JSON representation
A vscode extension to merge diffs
- Host: GitHub
- URL: https://github.com/moshfeu/vscode-diff-merge
- Owner: moshfeu
- License: mit
- Created: 2019-11-10T07:05:19.000Z (about 5 years ago)
- Default Branch: master
- Last Pushed: 2024-11-20T13:01:36.000Z (3 months ago)
- Last Synced: 2025-01-30T14:12:07.881Z (9 days ago)
- Topics: compare, merge, vscode, vscode-extension
- Language: HTML
- Homepage: https://marketplace.visualstudio.com/items?itemName=moshfeu.diff-merge
- Size: 2.31 MB
- Stars: 73
- Watchers: 3
- Forks: 7
- Open Issues: 11
-
Metadata Files:
- Readme: README.md
- Changelog: CHANGELOG.md
- License: LICENSE
Awesome Lists containing this project
README
## 🌅🌅 This extension is (almost) not needed anymore 🌅🌅
Since vscode [has 3 way merge built-in](https://code.visualstudio.com/updates/v1_69#_3-way-merge-editor), and even a better one, this extension is no longer needed.
I keep the extension and the source code for education and refrences only.
[](https://dev.azure.com/moshfeu-vscode/DiffMergeExtension/_build/latest?definitionId=1&branchName=master)
[](https://github.com/Coding-Coach/find-a-mentor/issues)
[](http://opensource.org/licenses/MIT)
[](https://github.com/moshfeu/vscode-diff-merge/releases)
[](https://marketplace.visualstudio.com/items?itemName=moshfeu.diff-merge)
[](https://twitter.com/moshfeu)
# Diff & Merge!
Show diffs and allow mergeing from left side to right side.
✋ **This extension is maintained on my free time. I'm only fixing / developing features requested by the community.**
🧙♂️ Notice that I (and seems that many others) couldn't find an easy way to implement such feature. Therefor, the user experience may not be perfect. The colors, fonts, icons, shortcuts and other UI elements may not be the same as vscode's.
👂**I would love to hear your feedback to improve this tool**
Found a bug? Have an extra ordinary idea? Please create an [issue](https://github.com/moshfeu/vscode-diff-merge/issues/new)
## Features
### 1. Diff and merge - file against file
Or
### File against selected file (#40)
**How to use?**
1. Right click on a file [1] in _explorer_ panel or on an editor tab
2. Click `[Diff & Merge] Select file to compare`
3. Right click on another file or an editor tab
4. Click `[Diff & Merge] Compare file with selected file`
### 2. Diff and merge - file against clipboard (#25)
**How to use?**
1. Right click on a file [1] in _explorer_ panel
2. Click `[Diff & Merge] Choose a file to merge`
3. Choose a file [1] to compare
### 3. Diff and merge - git - file against older version
**How to use?**
1. Right click on a file [1] in the source control panel under **Changes** (staged files are not editable anyway)
1. Click on `[Diff & Merge] Open Changes`
### 4. Diff and merge - svn - changes (tested with the [svg extension](https://marketplace.visualstudio.com/items?itemName=johnstoncode.svn-scm))
1. Right click on a file [1] in the source control panel under **Changes** (staged files are not editable anyway)
1. Click on `[Diff & Merge] Open Changes`
### 4. Diff and merge - from scratch
**How to use?**
1. Open commmand palette (Command / Ctrl + Shift + P)
1. Search for `[Diff & Merge] Blank diff view`
2. An empty diff view will opened. Paste a code in both sides and compare
[1] - Make sure that the file is text based (not images, binaries, pdfs etc.)
## To Do
- [ ] Add save button next to the diff navigator buttons
- [ ] Add "Go to original file" next to the save button
- [ ] Allow to change the "save" key binding
- [ ] Focus the tab when asking to compare a file that already open
- [ ] Add option to ignore files by pattern (?)
## Known issues
- Context menu shows up for non text based files (binary etc.)
- Diff editors theme has different look & feel than current theme ([monaco is not fully competiable with vscode theme](https://github.com/Microsoft/monaco-editor/issues/675#issuecomment-363151951))
- Left editor can be edited (to allow copy/paste for example) but can't saved
- When first comparing, the theme configuration file appearing for a moment - meant to retrive theme variables for the diff view theme
- [API limitation] For single comparing - left editor is editable but can't be saved
- [API limitation] Draft indication is next to the "x" icon but not on top of it
- [API limitation] Save is only with ctrl / cmd + s. There is no API to listen to "Save" event or getting the current save key binding
- [API limitation] File > Save is disabled
- [API limitation] When moving from dark to light theme, opened windows doesn't refreshed
## Development
```
yarn
cd resources/monaco
yarn
cd ../../
yarn webview:watch
```
Hit F5
To run the diff view directly in the browser
1. `yarn webview:watch`
2. `yarn monaco` (in different terminal)
3. Go to `http://localhost:12345/wrapper.html`
## Credits
## Thanks
I would love to have you in this list :)
