Some errors and warnings again, such as the following:

To https://github.com/NameUser/NameProject ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'https://github.com/NameUser/NameProject' подсказка: Updates were rejected because the tip of your current branch is behind подсказка: its remote counterpart. Integrate the remote changes (eg подсказка: 'git pull ...') before pushing again. подсказка: See the 'Note about fast-forwards' in 'git push --help' for details.

This is after I manually deleted several files on the server. Okay. I pull:

 warning: no common commits remote: Counting objects: 1069, done. remote: Compressing objects: 100% (6/6), done. Receiving objects: 100% (1069/1069), 1.08 MiB | 4.00 KiB/s, done. remote: Total 1069 (delta 0), reused 0 (delta 0), pack-reused 1063 Resolving deltas: 100% (630/630), done. From https://github.com/NameUser/NameProject * branch HEAD -> FETCH_HEAD error: The following untracked working tree files would be overwritten by merge: buildozer.spec Please move or remove them before you can merge. Aborting

Complained, they say, there are unsynchronized changes. The buildozer.spec file was drunk from the project a long time ago and is not tracked. Why is everything so difficult with these version control systems?

  • As if without version control systems everything is simple. ) - Nick Volynkin ♦

1 answer 1

 error: failed to push some refs to 'https://github.com/NameUser/NameProject' подсказка: Updates were rejected because the tip of your current branch is behind подсказка: its remote counterpart. Integrate the remote changes (eg подсказка: 'git pull ...') before pushing again. подсказка: See the 'Note about fast-forwards' in 'git push --help' for details.

It's all completely natural. New commits appeared on the server. You have to pick them up before pushing it.

Further.

 error: The following untracked working tree files would be overwritten by merge: buildozer.spec Please move or remove them before you can merge.

You have an untraceable buildozer.spec file in your local working directory. But on the server it is still monitored. Git tries to update its state during a pull. But since in your local repository, this file is no longer tracked, git has no right to do merge with it. Just delete it. Or, if you need it, rename, pull, rename it back.

  • You have to pick them up before pushing it. - what about some kind of forced push? :) - Grundy
  • There is no buildozer.spec file on the server, so I deleted it, so pullom cannot pick it up. And push, as you can see, does not pass. - Xyanight
  • @Xyanight it is not on the server, it is on your computer . Delete if you don’t need it, git isn’t responsible for it. - D-side
  • Thank you, figured out, you really helped! - Xyanight