https://github.com/bitsofinfo/merger.sh
https://github.com/bitsofinfo/merger.sh
Last synced: 10 months ago
JSON representation
- Host: GitHub
- URL: https://github.com/bitsofinfo/merger.sh
- Owner: bitsofinfo
- Created: 2020-07-17T13:08:41.000Z (over 5 years ago)
- Default Branch: master
- Last Pushed: 2020-07-17T14:41:08.000Z (over 5 years ago)
- Last Synced: 2025-01-29T11:12:57.778Z (12 months ago)
- Language: Shell
- Size: 3.91 KB
- Stars: 0
- Watchers: 0
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# merger.sh
Simple utility for merging branches w/ auto-tagging
## Usage
```
merger.sh fromBranchName toBranchName tagName
```
## Example
Clone this repo:
```
git clone https://github.com/bitsofinfo/merger.sh
```
Fork the test repo: https://github.com/bitsofinfo/merge-test-1
Clone your FORK above https://github.com/[your account]/merge-test-1
```
git clone https://github.com/[your account]/merge-test-1
cd merge-test-1
```
Progress a change through the branches
```
git checkout develop
echo "new file" > new-file.txt
git add new-file.txt
git commit new-file.txt -m "new-file.txt"
git push
```
Lets merge to `qa`, then `master` with auto tagging markers
```
merger.sh develop qa qa-NewFileChange
merger.sh qa master master-NewFileChange
```