News:

Want to praise Simutrans?
Your feedback is important for us ;D.

what is: "<<<<<<< HEAD"

Started by sdog, May 29, 2010, 06:03:06 AM

Previous topic - Next topic

0 Members and 1 Guest are viewing this topic.

sdog

in some source files of experimental i found those lines around some comments. can someone please explain what they mean? (google ain't very helpfull with this)

found in makeALL.mos
<<<<<<< HEAD
=======
# Note, ground.Outside.pak must be in the top dir for it to be ID'ed as a pak
>>>>>>> c8382029553e0cbf7b59fb4912b708629497c4da


found in simuconf.tab


<<<<<<< HEAD

# Intercity roads timeline. Format examples:
# city_road[0]=name,1900,1920
# city_road[1]=name2,1921,1950
=======
# Intercity roads timeline. Format examples:
# intercity_road[0]=name,1900,1920
# intercity_road[1]=name2,1921,1950
>>>>>>> c8382029553e0cbf7b59fb4912b708629497c4da

sanna

These are lines that git add when trying to merge two versions of a file, and the system does not entirely succeed on its own; i.e., they are indicators of where someone needs to manually merge a section of a file. HEAD refers to last committed version, and the long numerical tag is a commit tag.

jamespetts

Sdog,

where did you find these files...?
Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.

sdog

'lo sanna, james,

thanks for the explanation. it was quite helpfull.

james i found them in my local git branch. must have been inserted when i pulled a different branch after master, with git not able to resolve all changes. it's not in your files on github.

ps.: 'hope you had a good holiday

jamespetts

Sdog,

ahh, in which case you will have to merge the files. And yes, I did, thank you :-)
Download Simutrans-Extended.

Want to help with development? See here for things to do for coding, and here for information on how to make graphics/objects.

Follow Simutrans-Extended on Facebook.