Problem with git merge
Abierto
- Lenguaje dominante
- C++
- Estrellas
- 9.9k
- Forks
- 544
- Métricas de merge de PR
- Sin PR fusionados en 30 d
Descripción
Hello,
Thank you for this great tool. I don't know why, but I can't merge two branches that are supported by git-crypt... If I tried, the conflicted files are not changed at all, and I can't find any `<<<<<< HEAD` inside.
I'm using git-crypt 0.6.0, from debian unstable repository. Maybe it's related to this PR: https://github.com/AGWA/git-crypt/pull/107/commits/7a231050232eda53ca63aa6cc124113ae6ff8270
Thank you!
Guía de contribución
Evaluación
Este issue todavía no se ha evaluado.