git-annex-merge(1)

📦
version 10.20261026 · 4 versions
, in alpine 3.24, arch rolling, debian trixie, epel 10, fedora 43, fedora 44, nixos 26.05, nixpkgs unstable, opensuse-leap 16.0, ubuntu questing, ubuntu resolute, ubuntu stonking

✨ git-annex-merge ✨

okay bestie, welcome to the git-annex-merge(1) page from the git-annex manual 💖 this is the one where you pull all the remote drama into your local branch and let git-annex handle the mess. no data uploads, no downloads, just vibes and merges. periodt.

💅 NAME 💅

git-annex-merge — merge changes from remotes

🎀 SYNOPSIS 🎀

git annex merge [branch]

🦋 DESCRIPTION 🦋

so like, when you run this with zero parameters, it does the exact same merging (and merge conflict resolution, yes the messy part 😭) that git-annex pull and git-annex sync do — except it does it without uploading or downloading any data. literally just the merge, nothing else. main character behavior only, no extra tasks.

When you do specify a branch to merge, it merges that branch into your current branch, using the same merge conflict resolution as the git-annex pull command. This is especially useful on an adjusted branch, because it applies the same adjustment to the branch before merging it. slay 🫶

And heads up — when annex.resolvemerge is set to false, merge conflict resolution will not be done. so you're on your own with the conflicts at that point, ngl 🙈

⭐ OPTIONS ⭐

  • --allow-unrelated-histories, --no-allow-unrelated-histories — these get passed on to git merge, and they control whether or not you merge histories that do not share a common ancestor. like, do these two branches even know each other?? this flag decides. 👑
  • --json — Enable JSON output. This is intended to be parsed by programs that use git-annex. Each line of output is a JSON object. machine-readable realness ✨
  • --json-error-messages — Messages that would normally be output to standard error are included in the JSON instead. so the sad little error messages get to live inside the JSON too, cute 🎀

Also, the git-annex-common-options(1) can be used. don't forget about her 💜

🌸 SEE ALSO 🌸

go read the whole friend group, iykyk 🧚

🌈 AUTHOR 🌈

Joey Hess <id@joeyh.name>

fr fr, remember: no data goes anywhere when you merge like this. just branches getting to know each other. be safe, resolve your conflicts, and hydrate 💖

and that's the whole page bestie!! this was git-annex-merge(1) from the git-annex manual, written by Joey Hess, and it's the merge page in all her conflicted glory. ily, go merge something 🫶💅✨

📦 where this page comes from