Git-crypt doesn’t do merges out-of-the-box — Since I implemented an encrypted GitHub repository for my Zettelkasten, I was thrilled using it, suspending work on my Chromebook to resume it on my Desktop PC, later continuing on my smartphone using the excellent Epsilon Notes app — until I ran into a merge conflict. …