S
S
simonnidze2015-11-23 12:31:08
git
simonnidze, 2015-11-23 12:31:08

How to revert a working version of a project to git?

Hello! I screwed up really well and don't know what to do.
I entered some commands in git, made several pushes, and
as a result today I got the following structure in almost every php file of the project:
<<<<<<< HEAD
file content
======= file
content again
>>>> >>> 57c1011bb356546d0b4b8b6b3b26bd5e870acbcf
I understand that this is the commit hash at the end, but I don’t understand how to remove this crap and merge it together.
HELP!

Answer the question

In order to leave comments, you need to log in

1 answer(s)
A
aol-nnov, 2015-11-23
@aol-nnov

these are conflicts.
run git merge-tool, resolve conflicts and commit

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question