git clone https://github.com/MichaelDimmitt/git-auto-merge-configuration.git;cd git-auto-merge-configuration;pathtofile=pwd; echo "alias automergeall='ruby $($pathtofile)/setup_files/branch_info.rb'" >> ~/.bashrc; source ~/.bashrc;- cd (into a project with multiple branches.)
- type in terminal:
automergeall
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.
- do not create circular dependencies between your branches.
- 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