Step by step guide to update your server?
Re: Step by step guide to update your server?
New issues!
After updating our client I noticed that I could not equip any items except what was already equipped when logging in. Also none of your known spells would show up if you manually brought up your magic spell list. Then I noticed that when you bring up your character's status or equipment screen it did not list the job you were on. Just a blank space in that spot.
Checked again to make sure my client was 100% up to date, which it is. Obviously the next step is to get the latest pull from Darkstar.
After getting the latest pull I now get 5,710 errors and 93 warnings when recompiling the game server. Most everything looks like syntax errors, though for the most part I don't really know what I'm looking at.
What is my best course of action from here?
After updating our client I noticed that I could not equip any items except what was already equipped when logging in. Also none of your known spells would show up if you manually brought up your magic spell list. Then I noticed that when you bring up your character's status or equipment screen it did not list the job you were on. Just a blank space in that spot.
Checked again to make sure my client was 100% up to date, which it is. Obviously the next step is to get the latest pull from Darkstar.
After getting the latest pull I now get 5,710 errors and 93 warnings when recompiling the game server. Most everything looks like syntax errors, though for the most part I don't really know what I'm looking at.
What is my best course of action from here?
Re: Step by step guide to update your server?
make sure you didn't get any conflicts when pulling, revert any changes you made and then try compiling again
Re: Step by step guide to update your server?
Ok, changes reverted and compiled fine. But now still left with the issue of:kjLotus wrote:make sure you didn't get any conflicts when pulling, revert any changes you made and then try compiling again
1. Characters not having a job in the status or equipment menu.
2. No spells in your magic spells list.
3. Can't equip any weapon or armor. Can only wear/use what you already had on from your previous logout.
Re: Step by step guide to update your server?
either your server or your client are not completely up to date
do /ver and @revision in game to figure out what you're running on
do /ver and @revision in game to figure out what you're running on
Re: Step by step guide to update your server?
kjLotus wrote:either your server or your client are not completely up to date
do /ver and @revision in game to figure out what you're running on
ver: 30150223_2
revision: 642f4b4bef760646c96576686687da4aa8bbde44
Re: Step by step guide to update your server?
both of those look correct, which means you did not rebuild properly, or you did not launch the newly built binary (and launched the old one instead)
Re: Step by step guide to update your server?
Ok just attempted to pull again, using TortoiseGit > Pull.
So it seems that there is some conflicts. This is what I run into. If I choose TortoiseGit > Resolve to fix the conflicts I then receive the billion errors when recompiling again.Uleguerand/mobs/Floe_Amoeban.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Frost_Bomb_Mk-II.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Gefyrst.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Hoarmite.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Ice_Elemental.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Iceberg_Murex.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Impervious_Chariot.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Indrik.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Ironclad_Triturator.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Isgebind.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Koghatu.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Kur.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Maat.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Mechanical_Menace.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Ogopogo.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Olyphant.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Pantokrator.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Range_Clionid.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Refitted_Chariot.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Resheph.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Romaa_Mihgo.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Sierra_Tiger.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Sisyphus.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Snowflake.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Spectator.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Sturdy_Pyxis.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Sub-zero_Gear.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Svelldrake.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Trion.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Ungeweder.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Upas-Kamuy.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Verglas_Golem.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Veri_Selen.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Water_Elemental.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Yaguarogui.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Uleguerand/mobs/Zazarg.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/MobIDs.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Aestutaur.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Armillaria.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Ayravata.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Bastion_Fighter.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Bastion_Mage.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Blademaw_Pugil.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Bukhis.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Chhir_Batti.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Clammy_Imp.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Coccinelle.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Custodian.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Daggertooth_Pugil.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Decontaminator.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Devegetator.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Disassembler.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Div-e_Sepid.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Durinn.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Dvalinn.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Earth_Mover.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Edifier.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Ephemeral_Amoeban.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Ephemeral_Murex.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Fulmotondro.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Gnawtooth_Gary.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Gruesome_Gargouille.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Hanuman.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Helter-skelter.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Hm_zdei.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Hrosshvalur.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Iktomi.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Iku-Turso.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Immobilizer.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Ironclad_Executioner.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Jasconius.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Kadraeth_the_Hatespawn.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Karkadann.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Ketea.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Khalkotaur.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Lord_Varney.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Morose_Marid.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Oppressor.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Overseer.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Pascerpot.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Peapuk.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Pneumaflayer.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Qiqirn_Bewitcher.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Qiqirn_Trapper.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Quasimodo.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Rakshas.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Ravager_Chariot.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/River_Murex.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Russet_Rarab.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Scrutinizer.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Scythemaw_Jagil.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Sedna.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Seps.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Shewriwhile.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Sippoy.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Slaughterous_Smilodon.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Slough_Bats.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Speltercap.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Spitting_Spider.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Stream_Amoeban.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Sturdy_Pyxis.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Surveyor.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Vigilant_Gear.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Vigilant_Gears.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Vu_zdei.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Wily_Opo-opo.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/mobs/Xan.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/npcs/qm13.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/npcs/qm16.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Abyssea-Vunkerl/npcs/qm20.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Celennia_Wexworth_Memorial_Library/TextIDs.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Celennia_Wexworth_Memorial_Library/Zone.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Dynamis-Bastok/MobIDs.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Dynamis-Bastok/npcs/qm0.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Feretory/npcs/Teyrnon.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Leujaoam_Sanctum/TextIDs.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Lufaise_Meadows/mobs/Kurrea - Copy.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Periqia/TextIDs.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Port_Jeuno/npcs/AF3_Shop_Moogle.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/QuBia_Arena/mobs/Ancient_Sorcerer.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Qufim_Island/npcs/transcendental.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Stellar_Fulcrum/bcnms/indomitable_triumvirate_vs3.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/Stellar_Fulcrum/mobs/Prishe.lua.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in scripts/zones/ThAuto-merging src/map/lua/lua_baseentity.cpp
CONFLICT (content): Merge conflict in src/map/lua/lua_baseentity.cpp
Automatic merge failed; fix conflicts and then commit the result.
e_Last_Stand/TextIDs.lua.
The file will have its original line endings in your working directory.
git did not exit cleanly (exit code 1) (7394 ms @ 3/7/2015 3:46:42 PM)
Re: Step by step guide to update your server?
Update. I decided to go through each step again. Maybe I had a hiccup the first time around but I'm not quite to the end yet. This time around TortoiseGit seemed to resolve almost all issues and I was left with no warnings and only 5 errors during the recompile instead of the thousands I had before. See below:
All errors seem to be in that one file. Is it as simple as the instruction there says, just putting a ';' before each of those five spots in the file?1>c:\htpc\darkstar_projects\homeserver\src\map\lua\lua_baseentity.cpp(8166): error C2143: syntax error : missing ';' before '<<'
1>c:\htpc\darkstar_projects\homeserver\src\map\lua\lua_baseentity.cpp(8168): error C2143: syntax error : missing ';' before '=='
1>c:\htpc\darkstar_projects\homeserver\src\map\lua\lua_baseentity.cpp(8171): error C2143: syntax error : missing ';' before '{'
1>c:\htpc\darkstar_projects\homeserver\src\map\lua\lua_baseentity.cpp(8175): error C2181: illegal else without matching if
1>c:\htpc\darkstar_projects\homeserver\src\map\lua\lua_baseentity.cpp(8180): error C2143: syntax error : missing ';' before '>>'
========== Rebuild All: 0 succeeded, 1 failed, 0 skipped ==========
Re: Step by step guide to update your server?
Grabbed my copy of that file that I had before trying the git pull and placed it back in that folder. After that the game server recompiled perfectly.
However...... still the same issues. No character jobs, can't equip items, etc.
When I try to pull it says I am up to date. Playonline says up to date. Compile is done without errors. Now I'm out of ideas.
However...... still the same issues. No character jobs, can't equip items, etc.
When I try to pull it says I am up to date. Playonline says up to date. Compile is done without errors. Now I'm out of ideas.
Re: Step by step guide to update your server?
if you replace files in your source folders, then your source files aren't really "up to date" (as you replaced the up to date files with your old files)
the errors you got were 99% because you didn't resolve the conflicts (pretty much guarantee there was a <<<<<< on line 8166, which is a conflict diff marker)
the errors you got were 99% because you didn't resolve the conflicts (pretty much guarantee there was a <<<<<< on line 8166, which is a conflict diff marker)