https://github.com/md-command-line/git-auto-merge-configuration
https://github.com/md-command-line/git-auto-merge-configuration
Last synced: 11 months ago
JSON representation
- Host: GitHub
- URL: https://github.com/md-command-line/git-auto-merge-configuration
- Owner: md-command-line
- Created: 2018-02-09T11:19:41.000Z (over 8 years ago)
- Default Branch: master
- Last Pushed: 2018-02-11T22:04:07.000Z (over 8 years ago)
- Last Synced: 2025-07-02T05:05:58.761Z (12 months ago)
- Language: Ruby
- Size: 8.79 KB
- Stars: 1
- Watchers: 1
- Forks: 1
- Open Issues: 4
-
Metadata Files:
- Readme: Readme.md
Awesome Lists containing this project
README
# Not deployed and production ready.
### Reason, not achieving current intent.
# Installation/Usage
```bash
git clone https://github.com/MichaelDimmitt/git-auto-merge-configuration.git;
```
```bash
cd git-auto-merge-configuration;
```
```bash
pathtofile=pwd; echo "alias automergeall='ruby $($pathtofile)/setup_files/branch_info.rb'" >> ~/.bashrc; source ~/.bashrc;
```
#### next steps
1) cd (into a project with multiple branches.)
2) type in terminal: `automergeall`
# Configure your Base Branches with Dependant Branches
often when developing we have a base branch like "master"
every branch typically should be up to date with master.
This is often never an issue if programmming with best practices.
Lets imagine a quick fix is pushed onto master.
Conveniently this script allows automatic cherry-picking commits, updating dependant branches when the specified base branch changes.
# Things to watch out for...
1) do not create circular dependencies between your branches.
2) there should be built a delete function that finds specific shared commit accross the dependent branches and allows deletion of code. --cherry picked to a storage branch location if they ever need to recover that information. The commit will put as the message the sha along with the origin branch that called for the deletion. The branch that will store these commits will be called: automergeconfiguration-backing-up-removed-commits