Handling merges and conflicts in an encrypted GitHub Zettelkasten

Git-crypt doesn’t do merges out-of-the-box

Installing a merge handler for git-crypt

How to handle merges

Merge situations

Any conflicts can be found when searching for <<<<<. This line is followed by the local version of the line in question. In case of multiple consecutive lines, all of them will show up here. This section is followed by the separator =======. After that, the remote version of the chunk in question is presented until the end marker >>>>>>>.

Now you can decide how to go about these conflicting changes.

Appendix A: Testing merge

Appendix B: Future-proofing the Android scripts

--

--

Software engineer turned researcher, AI heavy data scientist with strong computer science and electronics skills.

Get the Medium app

A button that says 'Download on the App Store', and if clicked it will lead you to the iOS App store
A button that says 'Get it on, Google Play', and if clicked it will lead you to the Google Play store
Rene Schallner

Software engineer turned researcher, AI heavy data scientist with strong computer science and electronics skills.