Skip to content

mapFactory/git-auto-merge-configuration

 
 

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

13 Commits
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

Not deployed and production ready.

Reason, not achieving current intent.

Installation/Usage

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;

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

About

No description, website, or topics provided.

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Languages

  • Ruby 100.0%