{"_id":"@babajide234/git-merge-workflow","_rev":"7-e1148acb583d1e4b5ea21412d55fc694","name":"@babajide234/git-merge-workflow","dist-tags":{"latest":"1.0.6"},"versions":{"1.0.0":{"name":"@babajide234/git-merge-workflow","version":"1.0.0","keywords":["git","workflow","powershell","automation","devops"],"author":{"name":"babajide Tomoshegbo"},"license":"MIT","_id":"@babajide234/git-merge-workflow@1.0.0","maintainers":[{"name":"babajide234","email":"devjyde+npm@gmail.com"}],"homepage":"https://github.com/babajide234/GitMergeWorkflow#readme","bugs":{"url":"https://github.com/babajide234/GitMergeWorkflow/issues"},"bin":{"gmw":"bin/cli.js","git-merge-workflow":"bin/cli.js"},"dist":{"shasum":"087a1b435978c3faad17f80926f4c1786288637e","tarball":"https://registry.npmjs.org/@babajide234/git-merge-workflow/-/git-merge-workflow-1.0.0.tgz","fileCount":10,"integrity":"sha512-tMx9ooI39bPkTg5qfLNG4ekkJ0akRDNrlUOIvWTHfzaHElnNX+hMghTVt3E/AX+oD3tVGDuJ5SotmckqeEhstw==","signatures":[{"sig":"MEYCIQCU0cYi4z/EtkCYNGXX723T5lQQ4P9bPRwtdZtz2/vJqQIhALJ0l8Vfag3WSYVYLBFM8tavTwMxPUNmSwZv6/YBXez+","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":27296},"main":"index.js","engines":{"node":">=14"},"gitHead":"7e04643485a991cb78840f17069b77a8f4db9864","scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"_npmUser":{"name":"babajide234","email":"devjyde+npm@gmail.com"},"repository":{"url":"git+https://github.com/babajide234/GitMergeWorkflow.git","type":"git"},"_npmVersion":"11.1.0","description":"Automated Git workflow for merging feature branches through staging to develop","directories":{},"_nodeVersion":"23.5.0","_hasShrinkwrap":false,"_npmOperationalInternal":{"tmp":"tmp/git-merge-workflow_1.0.0_1768837573570_0.8913901292600899","host":"s3://npm-registry-packages-npm-production"}},"1.0.1":{"name":"@babajide234/git-merge-workflow","version":"1.0.1","keywords":["git","workflow","powershell","automation","devops"],"author":{"name":"babajide Tomoshegbo"},"license":"MIT","_id":"@babajide234/git-merge-workflow@1.0.1","maintainers":[{"name":"babajide234","email":"devjyde+npm@gmail.com"}],"homepage":"https://github.com/babajide234/GitMergeWorkflow#readme","bugs":{"url":"https://github.com/babajide234/GitMergeWorkflow/issues"},"bin":{"gmw":"bin/cli.js","git-merge-workflow":"bin/cli.js"},"dist":{"shasum":"756f41d3ff7c325aa32ca368c38f181cde3eff28","tarball":"https://registry.npmjs.org/@babajide234/git-merge-workflow/-/git-merge-workflow-1.0.1.tgz","fileCount":10,"integrity":"sha512-vyawB/2OAV/d75lBt5C8sn+fpqlC6d0/eZOdZRaw6cbRZQPbI640pS1lwja5/JS21LP0OjMAH3fhfi9hvZFRsw==","signatures":[{"sig":"MEUCIEc1eWblGGoTcqmfCrenUXYvlP64Yl0D6zuskP3DRHCqAiEApKt5D9JnqX2SEFNZbeOhwv9emNnI++pRqWKB4usO3O0=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":27296},"main":"index.js","engines":{"node":">=14"},"gitHead":"7e04643485a991cb78840f17069b77a8f4db9864","scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"_npmUser":{"name":"babajide234","email":"devjyde+npm@gmail.com"},"repository":{"url":"git+https://github.com/babajide234/GitMergeWorkflow.git","type":"git"},"_npmVersion":"11.1.0","description":"Automated Git workflow for merging feature branches through staging to develop","directories":{},"_nodeVersion":"23.5.0","_hasShrinkwrap":false,"_npmOperationalInternal":{"tmp":"tmp/git-merge-workflow_1.0.1_1768837841033_0.22093629281227756","host":"s3://npm-registry-packages-npm-production"}},"1.0.2":{"name":"@babajide234/git-merge-workflow","version":"1.0.2","keywords":["git","workflow","powershell","automation","devops"],"author":{"name":"babajide Tomoshegbo"},"license":"MIT","_id":"@babajide234/git-merge-workflow@1.0.2","maintainers":[{"name":"babajide234","email":"devjyde+npm@gmail.com"}],"homepage":"https://github.com/babajide234/GitMergeWorkflow#readme","bugs":{"url":"https://github.com/babajide234/GitMergeWorkflow/issues"},"bin":{"gmw":"bin/cli.js","git-merge-workflow":"bin/cli.js"},"dist":{"shasum":"510f66540bc56ecba9d31e8cfe85794036f482ba","tarball":"https://registry.npmjs.org/@babajide234/git-merge-workflow/-/git-merge-workflow-1.0.2.tgz","fileCount":8,"integrity":"sha512-ilbml6SQrrKrX5mm2O3JSG9yl7eXWHOPMKgCRb3vJXTmjN32Yks+QqZPVbSBc1QHVsP9WQa80wQk2XhCXKJ7HA==","signatures":[{"sig":"MEUCIAvrvTiY65+LLPYO4T5Nkhv8qzwJuGELec4+lpq9fTOSAiEAvorWIzbXuExdYX1ziVq8TJhoPfgMi9Ax2lX5+AggbHw=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":22469},"main":"index.js","engines":{"node":">=14"},"gitHead":"3dcb95abc2b62361027ff1c87a486c158efa7246","scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"_npmUser":{"name":"babajide234","email":"devjyde+npm@gmail.com"},"repository":{"url":"git+https://github.com/babajide234/GitMergeWorkflow.git","type":"git"},"_npmVersion":"11.1.0","description":"Automated Git workflow for merging feature branches through staging to develop","directories":{},"_nodeVersion":"23.5.0","_hasShrinkwrap":false,"_npmOperationalInternal":{"tmp":"tmp/git-merge-workflow_1.0.2_1768838615546_0.859479570170995","host":"s3://npm-registry-packages-npm-production"}},"1.0.3":{"name":"@babajide234/git-merge-workflow","version":"1.0.3","keywords":["git","workflow","powershell","automation","devops"],"author":{"name":"babajide Tomoshegbo"},"license":"MIT","_id":"@babajide234/git-merge-workflow@1.0.3","maintainers":[{"name":"babajide234","email":"devjyde+npm@gmail.com"}],"homepage":"https://github.com/babajide234/GitMergeWorkflow#readme","bugs":{"url":"https://github.com/babajide234/GitMergeWorkflow/issues"},"bin":{"gmw":"bin/cli.js","git-merge-workflow":"bin/cli.js"},"dist":{"shasum":"85fc05b6be3a10ee7ae729a93f2248fd34d1dbc9","tarball":"https://registry.npmjs.org/@babajide234/git-merge-workflow/-/git-merge-workflow-1.0.3.tgz","fileCount":8,"integrity":"sha512-J/gbEMYP+aElSN+nvmYwdDk7sb6hQaeJIFf3Ouxx7lvH2ZaJLxJ2pXiBkgS13P/lWy5siq6QwqshvNGxtqDG8w==","signatures":[{"sig":"MEUCIBq+CgTc8g3PgfAvRCH1ef4d9n+tFk7VQ+BZd/fkS8bKAiEA7NpFPumJthJy6y1RLBdnHSzQrcxszamzT1tbXpmSH70=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":22542},"main":"index.js","engines":{"node":">=14"},"gitHead":"3dcb95abc2b62361027ff1c87a486c158efa7246","private":false,"scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"_npmUser":{"name":"babajide234","email":"devjyde+npm@gmail.com"},"repository":{"url":"git+https://github.com/babajide234/GitMergeWorkflow.git","type":"git"},"_npmVersion":"11.1.0","description":"Automated Git workflow for merging feature branches through staging to develop","directories":{},"_nodeVersion":"23.5.0","publishConfig":{"access":"public"},"_hasShrinkwrap":false,"_npmOperationalInternal":{"tmp":"tmp/git-merge-workflow_1.0.3_1769114660528_0.1973849577725355","host":"s3://npm-registry-packages-npm-production"}},"1.0.4":{"name":"@babajide234/git-merge-workflow","version":"1.0.4","keywords":["git","workflow","powershell","automation","devops"],"author":{"name":"babajide Tomoshegbo"},"license":"MIT","_id":"@babajide234/git-merge-workflow@1.0.4","maintainers":[{"name":"babajide234","email":"devjyde+npm@gmail.com"}],"homepage":"https://github.com/babajide234/GitMergeWorkflow#readme","bugs":{"url":"https://github.com/babajide234/GitMergeWorkflow/issues"},"bin":{"gmw":"bin/cli.js","git-merge-workflow":"bin/cli.js"},"dist":{"shasum":"77829ea94b30dff5a81f0071b39414e3cdcbf8f2","tarball":"https://registry.npmjs.org/@babajide234/git-merge-workflow/-/git-merge-workflow-1.0.4.tgz","fileCount":7,"integrity":"sha512-JSqqv6fyviPa8je0BvEUqmj7BFBElVSAWRO5YE5FGQJPIp1Kc3Ee0WQCzWUknx2oPD/MTaReCbUeXSyLsjg3dQ==","signatures":[{"sig":"MEUCIQDIh/wJ3osxKHYyKozH/3NU6/8/4qItD3Y+wcHxeG5lGAIgLbgwao8SRBvBJlWU2LCC9seStB7DTdoDuxgkMyxlZ+M=","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":23578},"engines":{"node":">=14"},"gitHead":"897e6c4f688b6be12b7ed81a6a769dc0c673f10b","private":false,"scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"_npmUser":{"name":"babajide234","email":"devjyde+npm@gmail.com"},"repository":{"url":"git+https://github.com/babajide234/GitMergeWorkflow.git","type":"git"},"_npmVersion":"11.1.0","description":"Automated Git workflow for merging feature branches through staging to develop","directories":{},"_nodeVersion":"23.5.0","publishConfig":{"access":"public"},"_hasShrinkwrap":false,"_npmOperationalInternal":{"tmp":"tmp/git-merge-workflow_1.0.4_1770744862013_0.41769051873780105","host":"s3://npm-registry-packages-npm-production"}},"1.0.5":{"name":"@babajide234/git-merge-workflow","version":"1.0.5","keywords":["git","workflow","powershell","automation","devops"],"author":{"name":"babajide Tomoshegbo"},"license":"MIT","_id":"@babajide234/git-merge-workflow@1.0.5","maintainers":[{"name":"babajide234","email":"devjyde+npm@gmail.com"}],"homepage":"https://github.com/babajide234/GitMergeWorkflow#readme","bugs":{"url":"https://github.com/babajide234/GitMergeWorkflow/issues"},"bin":{"gmw":"bin/cli.js","git-merge-workflow":"bin/cli.js"},"dist":{"shasum":"5c98ead38a928fd747f610ca0236819ada45d7b9","tarball":"https://registry.npmjs.org/@babajide234/git-merge-workflow/-/git-merge-workflow-1.0.5.tgz","fileCount":7,"integrity":"sha512-Q242BVU6VieaLf1TNLOOcJ2jLj9OYUukWpaCz3oHUCUwPOZHQ2kJui085mHdOHVjP99ddgDKgyI9MIPVyQQutQ==","signatures":[{"sig":"MEYCIQD/Gd5fsQsRZpdeaGMhcwc7P+OVca2dt7wNR74e058MDwIhAIK3TUMklwU0FF8o4D2R1bykf1o813Fs0aiCMKJ+k2mP","keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U"}],"unpackedSize":23868},"engines":{"node":">=14"},"gitHead":"efdec36836b4583fe0bacc04e2019a819d3e88e2","private":false,"scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"_npmUser":{"name":"babajide234","email":"devjyde+npm@gmail.com"},"repository":{"url":"git+https://github.com/babajide234/GitMergeWorkflow.git","type":"git"},"_npmVersion":"11.7.0","description":"Automated Git workflow for merging feature branches through staging to develop","directories":{},"_nodeVersion":"25.3.0","publishConfig":{"access":"public"},"_hasShrinkwrap":false,"_npmOperationalInternal":{"tmp":"tmp/git-merge-workflow_1.0.5_1771617761620_0.4240186830065704","host":"s3://npm-registry-packages-npm-production"}},"1.0.6":{"name":"@babajide234/git-merge-workflow","version":"1.0.6","private":false,"publishConfig":{"access":"public"},"description":"Automated Git workflow for merging feature branches through staging to develop","bin":{"git-merge-workflow":"bin/cli.js","gmw":"bin/cli.js"},"scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"keywords":["git","workflow","powershell","automation","devops"],"author":{"name":"babajide Tomoshegbo"},"license":"MIT","repository":{"type":"git","url":"git+https://github.com/babajide234/GitMergeWorkflow.git"},"engines":{"node":">=14"},"gitHead":"6f34aeee2066a04c2086e7e92aa941a3b952ed7d","_id":"@babajide234/git-merge-workflow@1.0.6","bugs":{"url":"https://github.com/babajide234/GitMergeWorkflow/issues"},"homepage":"https://github.com/babajide234/GitMergeWorkflow#readme","_nodeVersion":"25.3.0","_npmVersion":"11.7.0","dist":{"integrity":"sha512-B1N/HhMfCvLWtHk1S4ZeaTeV6U6zjS7fTHjazYE7PHc58PgC7emT6XCN6y/CeONKtJXL5PPn2RfqsmEn4brSig==","shasum":"4ee6d08265a4c42f8c8f11e2b0a2940a25e0313d","tarball":"https://registry.npmjs.org/@babajide234/git-merge-workflow/-/git-merge-workflow-1.0.6.tgz","fileCount":7,"unpackedSize":24939,"signatures":[{"keyid":"SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U","sig":"MEQCIF9zwAy1BIP0pd08Jt0Pzh0ZmkSrLmnHkizRcba/Yof5AiBfiFDqzme1D8bKaeWL1wwfYhiYqB9jyTAPlC66gufMbQ=="}]},"_npmUser":{"name":"babajide234","email":"devjyde+npm@gmail.com"},"directories":{},"maintainers":[{"name":"babajide234","email":"devjyde+npm@gmail.com"}],"_npmOperationalInternal":{"host":"s3://npm-registry-packages-npm-production","tmp":"tmp/git-merge-workflow_1.0.6_1771622364163_0.8594692297891025"},"_hasShrinkwrap":false}},"time":{"created":"2026-01-19T15:46:13.401Z","modified":"2026-02-20T21:19:24.412Z","1.0.0":"2026-01-19T15:46:13.843Z","1.0.1":"2026-01-19T15:50:41.180Z","1.0.2":"2026-01-19T16:03:35.689Z","1.0.3":"2026-01-22T20:44:20.673Z","1.0.4":"2026-02-10T17:34:22.148Z","1.0.5":"2026-02-20T20:02:41.778Z","1.0.6":"2026-02-20T21:19:24.286Z"},"bugs":{"url":"https://github.com/babajide234/GitMergeWorkflow/issues"},"author":{"name":"babajide Tomoshegbo"},"license":"MIT","homepage":"https://github.com/babajide234/GitMergeWorkflow#readme","keywords":["git","workflow","powershell","automation","devops"],"repository":{"type":"git","url":"git+https://github.com/babajide234/GitMergeWorkflow.git"},"description":"Automated Git workflow for merging feature branches through staging to develop","maintainers":[{"name":"babajide234","email":"devjyde+npm@gmail.com"}],"readme":"# Git Merge Workflow PowerShell Module\n\nAutomate your git merge workflow with safety and ease. This module helps you merge your current feature branch to a staging branch (e.g., `feature-branch-staging`), and then to a target branch (e.g., `develop`), ensuring a consistent workflow.\n\n## Features\n\n- **Automated Merging**: Merges current branch -> Staging -> Target.\n- **Safety Checks**: Prevents running on wrong branches, checks for uncommitted changes.\n- **Conflict Handling**: Stops immediately on merge conflicts so you can resolve them.\n- **Automatic Cleanup**: Returns you to your original branch even if the script fails.\n- **Configurable**: Define project-specific settings via a JSON configuration file.\n- **Dry Run**: Support for `-WhatIf` to preview actions.\n\n## Installation\n\n### Via NPM (Recommended for Node.js users)\nYou can install this tool globally using npm:\n\n```bash\nnpm install -g @babajide234/git-merge-workflow\n```\nThis will make the `gmw` and `git-merge-workflow` commands available in your terminal.\n\n### Manual Installation\n1. Download this repository.\n2. Run the included installation script:\n   ```powershell\n   .\\Install.ps1\n   ```\n   Or copy the `GitMergeWorkflow` folder to your PowerShell modules directory manually.\n3. Import the module (if not auto-loaded):\n   ```powershell\n   Import-Module GitMergeWorkflow\n   ```\n\n## Usage\n\n### Basic Usage\nRun the workflow from your feature branch:\n```powershell\nInvoke-GitMergeWorkflow\n# OR use the alias\ngmw\n```\n\n### With Commit Message\nIf you have uncommitted changes, you can commit them as part of the workflow:\n```powershell\ngmw -CommitMessage \"Feat: Completed login page\"\n```\n\n### Dry Run (Preview)\nSee what commands would be executed without actually running them:\n```powershell\ngmw -WhatIf\n```\n\n### Custom Branches\nOverride default branches on the fly:\n```powershell\ngmw -TargetBranch \"main\" -StagingBranch \"custom-staging\"\n```\n\n## Configuration\n\nYou can create a configuration file for your project so you don't have to pass parameters every time.\n\n1. Navigate to your project root.\n2. Run the configuration generator:\n   ```powershell\n   New-GitWorkflowConfig -TargetBranch \"main\" -StagingSuffix \"-test\"\n   ```\n   \n   This creates a `.git-merge-workflow.json` file:\n   ```json\n   {\n     \"TargetBranch\": \"main\",\n     \"StagingSuffix\": \"-test\",\n     \"Remote\": \"origin\"\n   }\n   ```\n\n## Publishing (For Maintainers)\n\n### GitHub Actions\nThis repository is configured to automatically publish to:\n1. **PowerShell Gallery** (if `NUGET_KEY` secret is set)\n2. **NPM Registry** (if `NPM_TOKEN` secret is set)\n\nWhen you create a new Release in GitHub.\n\n### Manual Publishing\n\n**To NPM:**\n```bash\nnpm login\nnpm publish --access public\n```\n\n**To PowerShell Gallery:**\n```powershell\nPublish-Module -Path . -NuGetApiKey <Your-API-Key>\n```\n\n## Functions\n\n- `Invoke-GitMergeWorkflow` (Alias: `gmw`, `git-merge-workflow`): The main workflow command.\n- `New-GitWorkflowConfig`: Generates the `.git-merge-workflow.json` configuration file.\n- `Get-GitWorkflowConfig`: Reads the current configuration.\n\n## Cross-Platform Support (Mac/Linux)\n\nThis tool works on Windows, macOS, and Linux.\n\n### Requirements for macOS/Linux\nYou must have **PowerShell Core** (`pwsh`) installed.\n\n**macOS (Homebrew):**\n```bash\nbrew install --cask powershell\n```\n\n**Linux (Ubuntu):**\n```bash\nsudo apt-get install -y wget apt-transport-https software-properties-common\nwget -q \"https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb\"\nsudo dpkg -i packages-microsoft-prod.deb\nsudo apt-get update\nsudo apt-get install -y powershell\n```\n\n## License\nMIT\n","readmeFilename":"README.md"}