Skip to content

sedstrom/merge-fix

This branch is 8 commits behind rongi/merge-fix:master.

Folders and files

NameName
Last commit message
Last commit date

Latest commit

9505452 · Apr 18, 2018

History

23 Commits
Oct 5, 2017
Oct 5, 2017
May 12, 2016
Apr 18, 2018
Oct 5, 2017

Repository files navigation

Install

brew tap rongi/tap
brew install merge-fix

Use

When on a fix branch

mergefix

It will merge current branch into the master branch.

What it does

This single command

  • fetches changes from the remote
  • rebases fix branch on top of the master branch
  • merges fix branch into master branch with --ff-only flag
  • pushes everything to the remote
  • deletes local and remote fix branches
  • brings peace to the world and all the people happy and dancing in joy

It uses --ff-only merge strategy, which is only suitable for situations when you don’t want merge commit (bug fixes mostly)

About

Merges fix branch into develop branch

Resources

License

Stars

Watchers

Forks

Packages

No packages published

Languages

  • Ruby 63.1%
  • Shell 36.9%