F
F
Feenie2021-07-18 14:03:44
git
Feenie, 2021-07-18 14:03:44

How to run a multi-character git construct?

I downloaded the updated build from the github, tried to build it through the attached JS nickname, as I did before. However, today I encountered the fact that it cannot compile - in the project code and script, it compiled similar constructions for git:

<<<<<<< HEAD
=======
>>>>>>> origin/master

What needs to be put in order to avoid such an error? The project owners claim that everything is being built, but they themselves do not know what is required for a correct compilation.
SyntaxError: Unexpected token '<<'

Answer the question

In order to leave comments, you need to log in

1 answer(s)
A
Alexey Ukolov, 2021-07-18
@Feenie

This "multi-character construct" is an artifact of the merge conflict. The conflict needs to be resolved: git-scm.com/book/en/v2/Git-Branching-Basic-Branchi...
Or just delete it if it's really empty.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question