N
N
Nikolai Savelyev2016-08-04 07:37:10
PHP
Nikolai Savelyev, 2016-08-04 07:37:10

Why is php swearing?

Gentlemen programmers, help if you can.
After an unexpected reboot, the site stopped loading - error 500.
In the logs -

[Thu Aug 04 11:34:01.363258 2016] [:error] [pid 2023] [client 192.168.0.92:51674] PHP Parse error: syntax error, unexpected '<<' (T_SL) in /var/www/mysql_connect. php line 3

And the same for other files and lines.
This line contains a construction like <<<<<<< HEAD
What is the problem?
The programmer claims that everything worked yesterday.

Answer the question

In order to leave comments, you need to log in

1 answer(s)
A
Alexey Ukolov, 2016-08-04
@nikweter

These are conflict artifacts in .git. Someone did not resolve the conflict and pushed everything into the master.
This, of course, should be fixed by the programmer.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question