mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

remove the git-union-merge command

Browse source 
This has never been built and shipped as part of git-annex,
and including it as a pedagolical example in
the source code doesn't have much benefit. The program was not currently
buildable after recent OsPath changes.

Of course, Git/UnionMerge.hs is still available and can be used.
This commit is contained in:
Joey Hess 2025-02-12 12:37:36 -04:00
parent 17c1a1dde4
commit 46d38b002d
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 5 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/How_to_git_union-merge__63__.mdwn
View file

@ -22,3 +22,5 @@ Tried with (on a Manjaro box):
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...
> removed it, [[done]] --[[Joey]]