<<<<<< and ====== represent divisions between the existing code and the incoming code.
This is git saying "I can't do this automatically, please help.
One block represents the old code, one the new. You should delete one of the chunks from the code, leaving the other and maybe modifying it, and also delete those divider strings.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
<<<<<<and======represent divisions between the existing code and the incoming code.This is git saying "I can't do this automatically, please help.
One block represents the old code, one the new. You should delete one of the chunks from the code, leaving the other and maybe modifying it, and also delete those divider strings.