{"id":13679871,"url":"https://github.com/shaharkazaz/vscode-git-merger","last_synced_at":"2025-09-06T11:34:29.380Z","repository":{"id":122785139,"uuid":"94409153","full_name":"shaharkazaz/vscode-git-merger","owner":"shaharkazaz","description":"Available at vscode marketplace https://marketplace.visualstudio.com/items?itemName=shaharkazaz.git-merger","archived":false,"fork":false,"pushed_at":"2018-04-22T06:27:18.000Z","size":189,"stargazers_count":24,"open_issues_count":14,"forks_count":2,"subscribers_count":4,"default_branch":"master","last_synced_at":"2025-03-18T02:36:20.337Z","etag":null,"topics":["extension","git","git-merger","merger","vscode","vscode-extension"],"latest_commit_sha":null,"homepage":"","language":"TypeScript","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"mit","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/shaharkazaz.png","metadata":{"files":{"readme":"README.md","changelog":"CHANGELOG.md","contributing":null,"funding":null,"license":"LICENSE","code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null,"governance":null,"roadmap":null,"authors":null}},"created_at":"2017-06-15T06:50:58.000Z","updated_at":"2024-11-17T06:20:26.000Z","dependencies_parsed_at":"2024-01-14T15:11:23.951Z","dependency_job_id":"a28cb8de-02e7-4259-8201-8a3eb82ae400","html_url":"https://github.com/shaharkazaz/vscode-git-merger","commit_stats":null,"previous_names":[],"tags_count":6,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/shaharkazaz%2Fvscode-git-merger","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/shaharkazaz%2Fvscode-git-merger/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/shaharkazaz%2Fvscode-git-merger/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/shaharkazaz%2Fvscode-git-merger/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/shaharkazaz","download_url":"https://codeload.github.com/shaharkazaz/vscode-git-merger/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":244822632,"owners_count":20516142,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["extension","git","git-merger","merger","vscode","vscode-extension"],"created_at":"2024-08-02T13:01:10.515Z","updated_at":"2025-03-21T15:31:16.359Z","avatar_url":"https://github.com/shaharkazaz.png","language":"TypeScript","funding_links":[],"categories":["TypeScript"],"sub_categories":[],"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)\n\nMerging branches has never been easier.\n\n# Key Features 🗝\n\n* Stash \u0026 Patch - Uncommitted changes handler while merging.\n* Merge from - Merge any branch into your local branch.\n* 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)).\n\n# Road Map 🗺\n\nMy vision is to create the merge resolver we all want, a 3 screen just click and fix merger.  \nComing to your VScode.\n\n# Installation ⬇\n\nIn vscode marketplace search and install \"Git Merger\".  \nOr launch the vscode quick open (\u003ckbd\u003e⌘\u003c/kbd\u003e+\u003ckbd\u003ep\u003c/kbd\u003e  | \u003ckbd\u003eCtrl\u003c/kbd\u003e+\u003ckbd\u003ep\u003c/kbd\u003e) and run `ext install git-merger` \n\n# Commands 🗣\nThe extension commands that can be accessed from the command pallet (\u003ckbd\u003e⌘\u003c/kbd\u003e+\u003ckbd\u003eShift\u003c/kbd\u003e+\u003ckbd\u003ep\u003c/kbd\u003e | \u003ckbd\u003eCtrl\u003c/kbd\u003e+\u003ckbd\u003eShift\u003c/kbd\u003e+\u003ckbd\u003ep\u003c/kbd\u003e ):\n\n* ```GitMerger: Merge from...``` - Merge branch into working branch (write ```mf``` or ```gmf``` for short).\n* ```GitMerger: Continue merge``` - Continue the merge once the conflicts are done.\n* ```GitMerger: Abort merge``` - Abort the current merge. \n* ```GitMerger: Stash``` - Stash your WIP for later usage.\n* ```GitMerger: Unstash...``` - Apply stashed changes on working branch.\n* ```GitMerger: Clear stash``` - Remove any saved stashes.\n* ```GitMerger: Delete stash...``` - Delete a specific stash.\n\n# Help this extension be great 💪\n\nIf you want to contribute or have any feedback positive or negative, let me know!  \nContact via [Email](shahar.kazaz@gmail.com) or open an issue at this project's [Git Repo](https://github.com/shaharkazaz/vscode-git-merger/issues).  \n\n\n# License\n\n[MIT](https://github.com/shaharkazaz/vscode-git-merger/blob/master/LICENSE)\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fshaharkazaz%2Fvscode-git-merger","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fshaharkazaz%2Fvscode-git-merger","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fshaharkazaz%2Fvscode-git-merger/lists"}