Package git-octopus

Git commands for continuous delivery

https://github.com/lesfurets/git-octopus

The continuous merge workflow is meant for continuous integration/delivery and
is based on feature branching. git-octopus provides git commands to implement
it.

General Commands
Command Description
git-conflict record conflict resolution.
git-octopus extends git-merge with branch naming patterns.