Small Notes

With LibreOffice you can save files to .fodt (flat odt format) to keep it in sync with version control system like Git

Okular can search for inline comments in PDF but not popup notes, you can even annotate other files like djvu fith it.