Open viniciustrainottiobjective opened 1 year ago
I don't see tests in repo for compatibilites for git 2.39.1, anyone know if exists problem in this version for git-crypt?
I've had issues on a large repository, but have not yet been able to produce a reliable demonstration of the issue with a non-critical repository.
could you try to rebase instead merge ? In my case, this is a bug because an encrypted file have been removed from the target branch
Same problem here, on Mac OS Ventura 13.4 git version 2.41.0 git-crypt 0.7.0
I was having a similar problem when attempting to merge my trunk branch into a branch where I'd added git-crypt. In case it's useful for somebody else, for me it was fixed when I locked the files before running the merge.
FINALLY! Thanks a lot, @anero! You're the man 👍
Hi,
After to updated git version to 2.39.1 ubuntu focal version the git-crypt not working for merge command.
My config
.git/config
fileAny idea for bug git-crypt?