https://github.com/shaharkazaz/vscode-git-merger

Available at vscode marketplace https://marketplace.visualstudio.com/items?itemName=shaharkazaz.git-merger
https://github.com/shaharkazaz/vscode-git-merger

extension git git-merger merger vscode vscode-extension

Last synced: 10 days ago
JSON representation

Available at vscode marketplace https://marketplace.visualstudio.com/items?itemName=shaharkazaz.git-merger

• Host: GitHub
• URL: https://github.com/shaharkazaz/vscode-git-merger
• Owner: shaharkazaz
• License: mit
• Created: 2017-06-15T06:50:58.000Z (over 7 years ago)
• Default Branch: master
• Last Pushed: 2018-04-22T06:27:18.000Z (over 6 years ago)
• Last Synced: 2024-10-13T04:25:09.842Z (25 days ago)
• Topics: extension, git, git-merger, merger, vscode, vscode-extension
• Language: TypeScript
• Homepage:
• Size: 185 KB
• Stars: 24
• Watchers: 5
• Forks: 2
• Open Issues: 14
• Metadata Files:
  • Readme: README.md
  • Changelog: CHANGELOG.md
  • License: LICENSE

Awesome Lists containing this project

README

        
# ![alt text](./merger-icon.png "Git Merger") Git Merger [![](https://vsmarketplacebadge.apphb.com/version-short/shaharkazaz.git-merger.svg)](https://marketplace.visualstudio.com/items?itemName=shaharkazaz.git-merger) [![](https://vsmarketplacebadge.apphb.com/installs/shaharkazaz.git-merger.svg)](https://marketplace.visualstudio.com/items?itemName=shaharkazaz.git-merger) [![](https://vsmarketplacebadge.apphb.com/rating-short/shaharkazaz.git-merger.svg)](https://marketplace.visualstudio.com/items?itemName=shaharkazaz.git-merger)

Merging branches has never been easier.

# Key Features 🗝

* Stash & Patch - Uncommitted changes handler while merging.

* Merge from - Merge any branch into your local branch.

* Flexibility - Configure options on the git merge command (more info in the repo's [wiki](https://github.com/shaharkazaz/vscode-git-merger/wiki/User-config)).

# Road Map 🗺

My vision is to create the merge resolver we all want, a 3 screen just click and fix merger.  

Coming to your VScode.

# Installation ⬇

In vscode marketplace search and install "Git Merger".  

Or launch the vscode quick open (⌘+p  | Ctrl+p) and run `ext install git-merger` 

# Commands 🗣

The extension commands that can be accessed from the command pallet (⌘+Shift+p | Ctrl+Shift+p ):

* ```GitMerger: Merge from...``` - Merge branch into working branch (write ```mf``` or ```gmf``` for short).

* ```GitMerger: Continue merge``` - Continue the merge once the conflicts are done.

* ```GitMerger: Abort merge``` - Abort the current merge. 

* ```GitMerger: Stash``` - Stash your WIP for later usage.

* ```GitMerger: Unstash...``` - Apply stashed changes on working branch.

* ```GitMerger: Clear stash``` - Remove any saved stashes.

* ```GitMerger: Delete stash...``` - Delete a specific stash.

# Help this extension be great 💪

If you want to contribute or have any feedback positive or negative, let me know!  

Contact via [Email]([email protected]) or open an issue at this project's [Git Repo](https://github.com/shaharkazaz/vscode-git-merger/issues).  

# License

[MIT](https://github.com/shaharkazaz/vscode-git-merger/blob/master/LICENSE)