V
V
Velese2014-10-21 10:07:16
git
Velese, 2014-10-21 10:07:16

Git leaves information about changes in the file, how to fix it?

After the commit, unnecessary information appears in the files.
Here is an example
<<<<<<< HEAD
=======
Assemblies\WindowsGL\xTile.dllAssemblies\WindowsGL\xTile.Pipeline.dll
>>>>>>> 46f286154870cc5396ab274695e97c227d8474a8
What could be causing this and how to fix it?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
E
Edward, 2014-10-21
@Velese

I advise you to read Branching in Git - Branching and merging basics

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question