SRL Archive - Help and Support

well now that the new rev came out i have an odd compiling error because of somethign i don't even know what it means :p

in players.scar:

<<<<<<< .mine
var x, y:integer;
=======
var
  cx, cy: Integer;
>>>>>>> .r15

Line 92: [Error] (855:1): 'BEGIN' expected in script D:\Program Files\SCAR 3.14\includes\SRL/SRL/Core/Players.scar

in WoodCutting.scar

<<<<<<< .mine
Function FindAxe:boolean;
=======
function FindAxe:boolean;
>>>>>>> .r15

Line 20: [Error] (12873:1): 'BEGIN' expected in script D:\Program Files\SCAR 3.14\includes\srl/srl/skill/WoodCutting.scar

what are these? and how to fix? i've only tried one script, i'll try LAME next to see if the same thing comes up.
edit: yes lame gives me the error with players.scar too.

~RM

delete your entire srl and redownload. It means you changed your srl

thank you, that worked:)

~RM

In case you're still wondering though:

<<<<<<< .mine
>>>>>>> .r15

That's not something in SCAR…something happened to the repository, or a developer accidentally messed something up, and it came out like that. You could have just deleted all the lines that said that and it would have worked.

That's what happens when you have changed your srl includes and then you update, what you changed will after the
<<<<<<< .mine
what it changed the new includes (revision 15 in this case) will be after the
<<<<<<< .r15

It's actually something subversion places in a file when it fails to merge it…

Yea, when something is changed in the original file, Subversion will try to merge them, which usually succeeds.
But sometimes, when you changed something and the devs changed the same thing to something else, Subversion won't know how to merge them and will do it like this:

<<<<<<< .mine
writeln('This is my change');
=======
writeln('This is changed by the devs');
>>>>>>> .r15

Above the ====== is your own version, after it is the dev's one.