Git does not pull or push - what to do?

Question

git

So it goes.
I'm trying to pull changes to the server and I get:

a veil of files
Ok. I make a commit, I try to pull again - the same thing, but the veil has become much smaller
. I push and I get:

also an error
. And it’s not clear what to do with it in the end. Neither there nor here.
Ples, help
Now he writes this (on the server):

Answer 1

Well, they write to you in black in English: merge will wipe you a crowd of files (not tracked).

Answer 2

Branching and merging
basics Someone pushed the server before you.
Put some kind of graphical client - it will be more clear to you what is happening

Answer 3

Try it like this

git pull <псевдоним удаленного сервера> --allow-unrelated-histories

. Then, as you complete the merge git push, it should already pass without problems.