Cannot pull - Cannot stash

[fr0tt]

Cannot pull - Cannot stash

[roughnecks]

You can replicate by:

git clone --branch v2.7.1 https://github.com/fr0tt/benotes.git

Then go on with the installation and finally:

git checkout master

Same issue

[fr0tt]

I changed the line endings of the binary files to align with the rest of the files (that's the "CRLF will be replaced by LF").
Git isn't exactly helpful with auto resolving binary files.
I'm sorry for the inconvenience. I tried a couple of ways to make it smoother but they all failed and I have to change it eventually anyways.

The fix is however rather simple:
rm -R public/fonts && rm public/logo_144x144.png or just rm -R public
This removes all conflicting files and simply fetches the newest version of them from GitHub.

[roughnecks]

Nice, solved.