Automic VaultAutomic Vault

brew

Install git-octopus with Homebrew, dnf, Nix

Continuous merge workflow. Version 1.4 via Homebrew; verified 2026-05-19.

Install commandSecurity notes

install

Additional install commands

macOS

Homebrewverified · 100%
brew install git-octopus

local Homebrew formula metadata

Linux

Fedora dnfverified · 92%
sudo dnf install git-octopus

Fedora Rawhide package metadata · git-octopus · source: dl.fedoraproject.org

Nixverified · 92%
nix profile install nixpkgs#git-octopus

nixpkgs package indexes · pkgs/by-name/gi/git-octopus/package.nix · source: api.github.com

overview

Package summary

Continuous merge workflow

Commands and aliases

  • git-apply-conflict-resolution
  • git-conflict
  • git-octopus

history

Project history and usage

git-octopus is a Git extension for a continuous merge workflow based on feature branches. It adds git octopus for pattern-based multi-branch merges and git conflict for recording conflict resolutions that can be reused.

Project history

LesFurets published the repository on GitHub in 2014 and described the project as an attempt to reconcile feature branching with continuous integration and delivery. The first GitHub release, v1.0, appeared in 2015, followed by releases that added conflict-resolution support, documentation improvements, and chunk-mode changes.

Adoption history

Compared with the single-purpose Git helpers in this batch, git-octopus had a broader process pitch: its README describes CI jobs that merge all feature branches with the mainline and force-push the assembled result to an octopus branch for build and deployment. Packaging reached Homebrew, Fedora/RHEL-style RPM instructions, and Nix, which signals use beyond a private script.

How it is used

Teams use git-octopus to continuously build an integration branch made from many feature branches without making that merge part of long-lived history. When merges fail, git conflict can diagnose conflict pairs and store standard Git refs containing recorded resolutions that can be fetched and pushed.

Why package nerds care

The package matters to Git workflow enthusiasts because it turns Git's native octopus-merge idea into a CI/CD convention with installable commands, manpage-style documentation, release notes, and distribution packaging. It also documents a concrete branch policy: keep the mainline ready to ship, isolate work on small branches, and continuously test their combined result.

Timeline

  • 2014: Repository was created on GitHub.
  • 2015: v1.0 was released.
  • 2015: v1.1 introduced a first step toward conflict resolution.
  • 2016: v1.4 was released and RPM packaging notes documented version 1.4 packaging.
  • 2017: v2.0 beta releases marked a Go rewrite.

Related projects

  • git merge
  • continuous integration systems
  • feature-branch workflows

security posture

Risk level: green

narrow executable package without higher-risk signals.

Risk classifier

green risk · low confidence · appliance

Why

  • narrow executable package without higher-risk signals

Signals

  • metadata:no-higher-risk-signals

Install behavior

  • No Homebrew post-install hook is recorded in formula metadata.
  • Homebrew bottle metadata is available for 1 platform targets.

Recommended review

Before unattended agent use, check whether the tool reads plaintext credentials, writes remote state, publishes artifacts, or shells out to plugins.

executables

Installed executables

CommandKindExposureNote
git-apply-conflict-resolutioncliglobal executable
git-conflictcliglobal executable
git-octopuscliglobal executable

freshness

Version and freshness

These signals separate page generation age, package-manager activity, and upstream release comparison. Version lag is warned only when an evidence URL and comparable versions are present.

page generated2026-07-08
manager version1.4
manager updated2026-05-19
local dataok
upstreamcurrent
latest detectedv1.4

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

  • okNo freshness warnings were generated.

install metadata

Package metadata

Package keybrew:git-octopus
Version1.4
Package managerHomebrew
Package manager pagehttps://formulae.brew.sh/formula/git-octopus
Homepagehttps://github.com/lesfurets/git-octopus
Repositoryhttps://github.com/lesfurets/git-octopus
Upstream docshttps://lesfurets.github.io/git-octopus/doc/git-conflict.html
LicenseLGPL-3.0-only
Source archivehttps://github.com/lesfurets/git-octopus/archive/refs/tags/v1.4.tar.gz
Last updated2026-05-19T07:47:35-04:00
Pulseupdated
Bottleavailable (on all)
Homebrew post-installnot defined
Servicenone declared

registry facts

Source database details

Source DatabaseHomebrew formula API
Taphomebrew/core
Full Namegit-octopus
Version Scheme0
Revision0
Bottle Stable Root URLhttps://ghcr.io/v2/homebrew/core
Deprecatedyes
Disabledno
Keg Onlyno
URL Keys
  • stable

source database matches

Other package-manager records

Matches are pulled from external package-manager indexes and kept separate from local Automic Vault package links.

Nix95%

git-octopus

nix profile install nixpkgs#git-octopus
  • normalized package name match
  • Matched by: Git Octopus
nixpkgs package indexes · api.github.com · nixpkgs package indexes: pkgs/by-name/gi/git-octopus/package.nix from https://api.github.com/repos/NixOS/nixpkgs/git/trees/master?recursive=1
dnf95%

git-octopus 2.0-0.4.beta.3.fc44.27

Git commands for continuous delivery

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

sudo dnf install git-octopus
  • License: LGPL-3.0-only
  • Category: Unspecified
  • Architecture: x86_64
  • Source Package: git-octopus
  • 4 dependencies
  • 1 provides
  • normalized package name match
  • Matched by: Git Octopus
Fedora Rawhide package metadata · dl.fedoraproject.org · Fedora Rawhide package metadata: git-octopus from https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/repodata/e5ca8ce900cd68f5419e1c39ae517343100b306336cbaeb70a3c153121d95094-primary.xml.zst

package graph

Links come from deterministic package relationships, av.db category and tag curation, ecosystem matches, and package hub membership.

Same workflow

  • git-imergeShares av.db curated category or tags: cli, conflict-resolution, developer-tools, git, merge.
  • git-mediateShares av.db curated category or tags: cli, conflict-resolution, developer-tools, git, git-extension.
  • mergirafShares av.db curated category or tags: cli, developer-tools, git, merge-tools, version-control.
  • git-lfsShares av.db curated category or tags: cli, developer-tools, git, git-extension, version-control.
  • git-macheteShares av.db curated category or tags: cli, developer-tools, git, git-extension, version-control.
  • git-multipushShares av.db curated category or tags: cli, developer-tools, git, git-extension, version-control.

source trail

Generated from repository data

This page is generated by av-web from the private package SQLite artifact built by scripts/generate-pkg-sqlite.py.

Used sources

  • Geiger risk classifier
  • Nucleus package database
  • av.db category and tag curation
  • cross-ecosystem install command graph
  • curated package history
  • external package-manager database matches
  • package relationship graph
  • package version freshness
  • package-page enrichment