What has done on the gita now very many files appeared

<<<<<<< HEAD ======= >>>>>>> e10f49a05efad469c142c965d89fb5196bab3dbb

Well, then the old and new code. I understand for sure that there is no such thing on the repository. How can I fix this, that is, re-download all the files from the repository?

  • The essence of the question is not completely clear. "re-download all files from the repository" - because you can simply delete the project and re-clone. Or roll back all changes. - Alexandr Sysoev
  • @AlexandrSysoev and how to roll back the changes - Sergalas
  • These are merge conflicts. You can manually remove unwanted lines and add files to commit. Or you can use third-party utilities to resolve conflicts in git (google) - A1essandro

1 answer 1

Most likely you did git pull and an automatic merge occurred. Nothing scary, the usual thing. If this is all not needed, then the git merge --abort command will most likely help (But you will need to re- git merge --abort ). A more correct way is to carry.

Open your project in your favorite ide and look for the occurrences of the string "=======" , watch and leave the correct piece of code. Then for all the git add and commit files as usual.

Also, perhaps, you did a rebase (with whom it does not happen) - then the cancellation is git rebase --abort .