From b0b54b678b8646621b815912edb7e51f71f7bf06 Mon Sep 17 00:00:00 2001 From: nobodyinperson Date: Sun, 5 Nov 2023 13:58:25 +0000 Subject: [PATCH] report --- doc/bugs/How_to_git_union-merge__63__.mdwn | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/bugs/How_to_git_union-merge__63__.mdwn diff --git a/doc/bugs/How_to_git_union-merge__63__.mdwn b/doc/bugs/How_to_git_union-merge__63__.mdwn new file mode 100644 index 0000000000..3272cd2508 --- /dev/null +++ b/doc/bugs/How_to_git_union-merge__63__.mdwn @@ -0,0 +1,24 @@ +### Please describe the problem. + +It's unclear how to use `git union-merge` as described [here](https://git-annex.branchable.com/git-union-merge/). + +### What steps will reproduce the problem? + +Run `git union-merge`, yields `git: 'union-merge' is not a git command. See 'git --help'.` + +No binary `git-union-merge` is shipped in the standalone tarball and distros also don't seem to ship it. + +### What version of git-annex are you using? On what operating system? + +Tried with (on a Manjaro box): + +- git-annex-standalone-amd64.tar.gz 2023-10-09 14:21 51M from [here](https://downloads.kitenet.net/git-annex/linux/current/) (the build is a month old, is that right?) +- `git-annex` in Manjaro repos +- `git-annex-standalone-nightly-bin` from AUR +- `nix-shell -p git-annex` (10.20230926 in nixos-unstable) + +### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) + +git-annex rules and is a marvelous tool. + +I wanted to try the union merging to resolve merge conflicts on non-annexed files. It's not ideal, but might be better than repeated `git annex assist|sync` eventually adding the merge conflict markers `<<<<<<<<<` and the like to the files, breaking things like `.gitattributes` syntax which in turn has more devastating lockup consequences...