C:\knots>git pull
remote: Counting objects: 340, done.
remote: Compressing objects: 100% (135/135), done.
remote: Total 286 (delta 168), reused 252 (delta 145)s
Receiving objects: 100% (286/286), 4.12 MiB | 460 KiB/s, done.
Resolving deltas: 100% (168/168), completed with 16 local objects.
From git://github.com/solmis/knots
07f3e5b..455919d master -> origin/master
Updating 07f3e5b..455919d
error: Entry 'client/src/vapis/version.vapi' not uptodate. Cannot merge.