S
S
Sergey Beloventsev2017-09-25 12:36:33
git
Sergey Beloventsev, 2017-09-25 12:36:33

How to fix your bad work on git?

I did something on the git, now a lot of files have appeared

<<<<<<< HEAD

=======
>>>>>>> e10f49a05efad469c142c965d89fb5196bab3dbb

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

Answer the question

In order to leave comments, you need to log in

1 answer(s)
V
Vitaly Stolyarov, 2017-09-25
@Sergalas

This is a merge conflict. It happens because changes were made in parallel in two branches (before ======= what has changed in one branch, after - in the other)
It is understood that now all this needs to be corrected by hand. The content shows that in the first branch in the files there is an empty line, and in the other branch there is no line.
It seems that this appeared after automatic formatting of the code (if this is the case everywhere), so it's better to checkout to the right place (roll back changes in one of the branches) or fetch if the necessary changes already exist on the remote repository

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question