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

Merge branch 'ospath'

Browse source
This commit is contained in:
Joey Hess 2025-02-17 11:58:20 -04:00
commit 5324f34092
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
384 changed files with 4796 additions and 4542 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]]