How to update into latest rathena?

[rakuzas]

Hi,

Sorry for asking this question.. Before this, I'm using Tortoise SVN back in 2013.. And It much easier to update and checking new and conflict item.. But when I'm using GIT.. I'm kinda confuse with how to update my current outdated rathena into latest as in github.. Because, I just download new rathena from github about 2 month ago and copy custom script and edit vanilla script from my old 2013 rathena..

I already search how to update this using git but I not fully understand how.. I keep getting error.. Maybe I'm using wrong method for updating.. Hope someone can guide me.. Thank you..

[Chaos92]

git pull

[rakuzas]

45 minutes ago, Chaos92 said:

git pull

I tried git pull in my current rathena.. And got this message :

 

npc/re/quests/quests_glastheim.txt
npc/re/quests/quests_izlude.txt
npc/re/quests/quests_lighthalzen.txt
npc/re/quests/quests_malangdo.txt
npc/re/quests/quests_malaya.txt
npc/re/quests/quests_mora.txt
npc/re/quests/quests_morocc.txt
npc/re/quests/quests_nameless.txt
npc/re/quests/quests_veins.txt
npc/re/quests/skills/swordman_skills.txt
npc/re/quests/woe_te/te_goditem_alde1.txt
npc/re/quests/woe_te/te_goditem_prt01.txt
npc/re/quests/woe_te/te_mission_alde.txt
npc/re/quests/woe_te/te_mission_main.txt
npc/re/quests/woe_te/te_mission_prt.txt
npc/re/scripts_athena.conf
npc/re/scripts_guild.conf
npc/re/scripts_jobs.conf
npc/re/scripts_main.conf
npc/re/scripts_mapflags.conf
npc/re/scripts_monsters.conf
npc/re/scripts_warps.conf
npc/re/warps/cities/brasilis.txt
npc/re/warps/cities/dewata.txt
npc/re/warps/cities/dicastes.txt
npc/re/warps/cities/eclage.txt
npc/re/warps/cities/izlude.txt
npc/re/warps/cities/malangdo.txt
npc/re/warps/cities/malaya.txt
npc/re/warps/cities/rachel.txt
npc/re/warps/cities/yggdrasil.txt
npc/re/warps/dungeons/bra_dun.txt
npc/re/warps/dungeons/dic_dun.txt
npc/re/warps/dungeons/ecl_dun.txt
npc/re/warps/dungeons/ecl_tdun.txt
npc/re/warps/dungeons/iz_dun.txt
npc/re/warps/dungeons/moc_pryd.txt
npc/re/warps/fields/bif_fild.txt
npc/re/warps/fields/bra_fild.txt
npc/re/warps/fields/com_fild.txt
npc/re/warps/fields/dic_fild.txt
npc/re/warps/fields/geffen_fild.txt
npc/re/warps/fields/hugel_fild.txt
npc/re/warps/fields/morroc_fild.txt
npc/re/warps/fields/payon_fild.txt
npc/re/warps/fields/prontera_fild.txt
npc/re/warps/fields/rachel_fild.txt
npc/re/warps/fields/veins_fild.txt
npc/re/warps/fields/yuno_fild.txt
npc/re/warps/guildcastles.txt
npc/re/warps/other/arena.txt
npc/re/warps/other/dimensional_gap.txt
npc/re/warps/other/jobquests.txt
npc/re/warps/other/paradise.txt
npc/re/warps/other/s_workshop.txt
npc/re/warps/other/sign.txt
npc/scripts_athena.conf
npc/scripts_custom.conf
npc/scripts_guild.conf
npc/scripts_jobs.conf
npc/scripts_mapflags.conf
npc/scripts_monsters.conf
npc/scripts_test.conf
npc/scripts_warps.conf
npc/test/OnInterInit.txt
npc/test/infinite_warp.txt
npc/test/npc_test_checkweight.txt
npc/warps/cities/alberta.txt
npc/warps/cities/aldebaran.txt
npc/warps/cities/amatsu.txt
npc/warps/cities/ayothaya.txt
npc/warps/cities/comodo.txt
npc/warps/cities/einbech.txt
npc/warps/cities/einbroch.txt
npc/warps/cities/geffen.txt
npc/warps/cities/gonryun.txt
npc/warps/cities/hugel.txt
npc/warps/cities/lighthalzen.txt
npc/warps/cities/louyang.txt
npc/warps/cities/lutie.txt
npc/warps/cities/manuk.txt
npc/warps/cities/mid_camp.txt
npc/warps/cities/morroc.txt
npc/warps/cities/moscovia.txt
npc/warps/cities/nameless.txt
npc/warps/cities/niflheim.txt
npc/warps/cities/payon.txt
npc/warps/cities/prontera.txt
npc/warps/cities/splendide.txt
npc/warps/cities/umbala.txt
npc/warps/cities/veins.txt
npc/warps/cities/yuno.txt
npc/warps/dungeons/abbey.txt
npc/warps/dungeons/abyss.txt
npc/warps/dungeons/alde_dun.txt
npc/warps/dungeons/ama_dun.txt
npc/warps/dungeons/anthell.txt
npc/warps/dungeons/ayo_dun.txt
npc/warps/dungeons/beach_dun.txt
npc/warps/dungeons/c_tower.txt
npc/warps/dungeons/ein_dun.txt
npc/warps/dungeons/gef_dun.txt
npc/warps/dungeons/gon_dun.txt
npc/warps/dungeons/ice_dun.txt
npc/warps/dungeons/in_sphinx.txt
npc/warps/dungeons/iz_dun.txt
npc/warps/dungeons/juperos.txt
npc/warps/dungeons/kh_dun.txt
npc/warps/dungeons/lhz_dun.txt
npc/warps/dungeons/lou_dun.txt
npc/warps/dungeons/mag_dun.txt
npc/warps/dungeons/mjo_dun.txt
npc/warps/dungeons/moc_pryd.txt
npc/warps/dungeons/mosk_dun.txt
npc/warps/dungeons/odin.txt
npc/warps/dungeons/orcsdun.txt
npc/warps/dungeons/pay_dun.txt
npc/warps/dungeons/prt_maze.txt
npc/warps/dungeons/ra_san.txt
npc/warps/dungeons/tha_t.txt
npc/warps/dungeons/thor_v.txt
npc/warps/dungeons/treasure.txt
npc/warps/dungeons/tur_dun.txt
npc/warps/dungeons/um_dun.txt
npc/warps/dungeons/xmas_dun.txt
npc/warps/fields/abyss_warper.txt
npc/warps/fields/amatsu_fild.txt
npc/warps/fields/ein_fild.txt
npc/warps/fields/gefenia.txt
npc/warps/fields/glastheim.txt
npc/warps/fields/jawaii.txt
npc/warps/fields/lhalzen_fild.txt
npc/warps/fields/lutie_fild.txt
npc/warps/fields/man_fild.txt
npc/warps/fields/mtmjolnir.txt
npc/warps/fields/spl_fild.txt
npc/warps/fields/umbala_fild.txt
npc/warps/guildcastles.txt
npc/warps/other/airplane.txt
npc/warps/other/arena.txt
npc/warps/other/god.txt
npc/warps/other/jobquests.txt
npc/warps/other/kiel.txt
npc/warps/other/other.txt
npc/warps/pvp.txt
pcre3.dll
rAthena-10.sln
rAthena-12.sln
rAthena-13.sln
rAthena-14.sln
rAthena-9.sln
runserver.bat
serv.bat
sql-files/item_cash_db.sql
sql-files/item_cash_db2.sql
sql-files/item_db.sql
sql-files/item_db2.sql
sql-files/item_db2_re.sql
sql-files/item_db_re.sql
sql-files/logs.sql
sql-files/main.sql
sql-files/mob_db.sql
sql-files/mob_db2.sql
sql-files/mob_db2_re.sql
sql-files/mob_db_re.sql
sql-files/mob_skill_db.sql
sql-files/mob_skill_db2.sql
sql-files/mob_skill_db2_re.sql
sql-files/mob_skill_db_re.sql
sql-files/roulette_default_data.sql
sql-files/tools/convert_engine_innodb.sql
sql-files/tools/convert_engine_myisam.sql
sql-files/tools/convert_passwords.sql
sql-files/upgrades/upgrade_20131105.sql
sql-files/upgrades/upgrade_20131111.sql
sql-files/upgrades/upgrade_20131115.sql
sql-files/upgrades/upgrade_20131115_2.sql
sql-files/upgrades/upgrade_20131118.sql
sql-files/upgrades/upgrade_20131227.sql
sql-files/upgrades/upgrade_20131231.sql
sql-files/upgrades/upgrade_20140104.sql
sql-files/upgrades/upgrade_20140114.sql
sql-files/upgrades/upgrade_20140205.sql
sql-files/upgrades/upgrade_20140523.sql
sql-files/upgrades/upgrade_20140612.sql
sql-files/upgrades/upgrade_20140612_log.sql
sql-files/upgrades/upgrade_20140616.sql
sql-files/upgrades/upgrade_20140627.sql
sql-files/upgrades/upgrade_20140713_log.sql
sql-files/upgrades/upgrade_20140723.sql
sql-files/upgrades/upgrade_20140822.sql
sql-files/upgrades/upgrade_20140826.sql
sql-files/upgrades/upgrade_20140915.sql
sql-files/upgrades/upgrade_20140915_log.sql
sql-files/upgrades/upgrade_20150103_log.sql
sql-files/upgrades/upgrade_20150131.sql
sql-files/upgrades/upgrade_20150211_skillset.sql
sql-files/upgrades/upgrade_20150327_market.sql
sql-files/upgrades/upgrade_20150408.sql
sql-files/upgrades/upgrade_20150408_log.sql
sql-files/upgrades/upgrade_20150619.sql
sql-files/upgrades/upgrade_20150619_log.sql
sql-files/upgrades/upgrade_20150804_log.sql
sql-files/upgrades/upgrade_20150828.sql
sql-files/upgrades/upgrade_20150831.sql
sql-files/upgrades/upgrade_20150917_log.sql
sql-files/upgrades/upgrade_20151230_log.sql
sql-files/upgrades/upgrade_20160106.sql
sql-files/upgrades/upgrade_20160112.sql
sql-files/upgrades/upgrade_20160614.sql
sql-files/upgrades/upgrade_20160814.sql
sql-files/upgrades/upgrade_20160814_log.sql
sql-files/upgrades/upgrade_svn15003.sql
sql-files/upgrades/upgrade_svn15420_log.sql
sql-files/upgrades/upgrade_svn15519_log.sql
sql-files/upgrades/upgrade_svn15531_db.sql
sql-files/upgrades/upgrade_svn15572.sql
sql-files/upgrades/upgrade_svn15818_log.sql
sql-files/upgrades/upgrade_svn15885.sql
sql-files/upgrades/upgrade_svn15926_log.sql
sql-files/upgrades/upgrade_svn16490.sql
sql-files/upgrades/upgrade_svn16518.sql
sql-files/upgrades/upgrade_svn16639.sql
sql-files/upgrades/upgrade_svn16645.sql
sql-files/upgrades/upgrade_svn16663.sql
sql-files/upgrades/upgrade_svn16823.sql
sql-files/upgrades/upgrade_svn16914_log.sql
sql-files/upgrades/upgrade_svn17014.sql
sql-files/upgrades/upgrade_svn17080.sql
sql-files/upgrades/upgrade_svn17080_log.sql
sql-files/upgrades/upgrade_svn17086.sql
sql-files/upgrades/upgrade_svn17086_log.sql
sql-files/upgrades/upgrade_svn17136.sql
sql-files/upgrades/upgrade_svn17176.sql
sql-files/upgrades/upgrade_svn17178.sql
sql-files/upgrades/upgrade_svn17183.sql
sql-files/upgrades/upgrade_svn17194.sql
sql-files/upgrades/upgrade_svn17242.sql
sql-files/upgrades/upgrade_svn17256.sql
sql-files/upgrades/upgrade_svn17303_log.sql
sql-files/upgrades/upgrade_svn17351.sql
sql-files/upgrades/upgrade_svn17541.sql
src/CMakeLists.txt
src/char/CMakeLists.txt
src/char/Makefile.in
src/char/char.c
src/char/char.h
src/char/char_clif.c
src/char/char_clif.h
src/char/char_cnslif.c
src/char/char_cnslif.h
src/char/char_logif.c
src/char/char_logif.h
src/char/char_mapif.c
src/char/char_mapif.h
src/char/int_auction.c
src/char/int_auction.h
src/char/int_elemental.c
src/char/int_elemental.h
src/char/int_guild.c
src/char/int_guild.h
src/char/int_homun.c
src/char/int_homun.h
src/char/int_mail.c
src/char/int_mail.h
src/char/int_mercenary.c
src/char/int_mercenary.h
src/char/int_party.c
src/char/int_party.h
src/char/int_pet.c
src/char/int_pet.h
src/char/int_quest.c
src/char/int_quest.h
src/char/int_storage.c
src/char/int_storage.h
src/char/inter.c
src/char/inter.h
src/common/CMakeLists.txt
src/common/Makefile.in
src/common/atomic.h
src/common/cbasetypes.h
src/common/cli.c
src/common/cli.h
src/common/conf.c
src/common/conf.h
src/common/core.c
src/common/core.h
src/common/db.c
src/common/db.h
src/common/des.c
src/common/des.h
src/common/ers.c
src/common/ers.h
src/common/evdp.h
src/common/evdp_epoll.c
src/common/grfio.c
src/common/grfio.h
src/common/malloc.c
src/common/malloc.h
src/common/mapindex.c
src/common/mapindex.h
src/common/md5calc.c
src/common/md5calc.h
src/common/mempool.c
src/common/mempool.h
src/common/mmo.h
src/common/msg_conf.c
src/common/msg_conf.h
src/common/mutex.c
src/common/mutex.h
src/common/netbuffer.c
src/common/netbuffer.h
src/common/network.c
src/common/network.h
src/common/nullpo.c
src/common/nullpo.h
src/common/raconf.c
src/common/raconf.h
src/common/random.c
src/common/random.h
src/common/showmsg.c
src/common/showmsg.h
src/common/socket.c
src/common/socket.h
src/common/spinlock.h
src/common/sql.c
src/common/sql.h
src/common/strlib.c
src/common/strlib.h
src/common/thread.c
src/common/thread.h
src/common/timer.c
src/common/timer.h
src/common/utils.c
src/common/utils.h
src/common/winapi.h
src/config/classes/general.h
src/config/const.h
src/config/core.h
src/config/renewal.h
src/config/secure.h
src/custom/atcommand.inc
src/custom/atcommand_def.inc
src/custom/battle_config_init.inc
src/custom/battle_config_struct.inc
src/custom/script.inc
src/custom/script_def.inc
src/login/CMakeLists.txt
src/login/Makefile.in
src/login/account.c
src/login/account.h
src/login/ipban.c
src/login/ipban.h
src/login/login.c
src/login/login.h
src/login/loginchrif.c
src/login/loginchrif.h
src/login/loginclif.c
src/login/loginclif.h
src/login/logincnslif.c
src/login/logincnslif.h
src/login/loginlog.c
src/login/loginlog.h
src/login/server/CMakeLists.txt
src/map/CMakeLists.txt
src/map/Makefile.in
src/map/atcommand.c
src/map/atcommand.h
src/map/battle.c
src/map/battle.h
src/map/battleground.c
src/map/battleground.h
src/map/buyingstore.c
src/map/buyingstore.h
src/map/cashshop.c
src/map/cashshop.h
src/map/channel.c
src/map/channel.h
src/map/chat.c
src/map/chat.h
src/map/chrif.c
src/map/chrif.h
src/map/clif.c
src/map/clif.h
src/map/date.c
src/map/date.h
src/map/duel.c
src/map/duel.h
src/map/elemental.c
src/map/elemental.h
src/map/guild.c
src/map/guild.h
src/map/homunculus.c
src/map/homunculus.h
src/map/instance.c
src/map/instance.h
src/map/intif.c
src/map/intif.h
src/map/itemdb.c
src/map/itemdb.h
src/map/log.c
src/map/log.h
src/map/mail.c
src/map/mail.h
src/map/map.c
src/map/map.h
src/map/mapreg.c
src/map/mapreg.h
src/map/mercenary.c
src/map/mercenary.h
src/map/mob.c
src/map/mob.h
src/map/npc.c
src/map/npc.h
src/map/npc_chat.c
src/map/party.c
src/map/party.h
src/map/path.c
src/map/path.h
src/map/pc.c
src/map/pc.h
src/map/pc_groups.c
src/map/pc_groups.h
src/map/pet.c
src/map/pet.h
src/map/quest.c
src/map/quest.h
src/map/script.c
src/map/script.h
src/map/script_constants.h
src/map/searchstore.c
src/map/searchstore.h
src/map/server/CMakeLists.txt
src/map/skill.c
src/map/skill.h
src/map/status.c
src/map/status.h
src/map/storage.c
src/map/storage.h
src/map/trade.c
src/map/trade.h
src/map/unit.c
src/map/unit.h
src/map/vending.c
src/map/vending.h
src/tool/CMakeLists.txt
src/tool/Makefile.in
src/tool/mapcache.c
tools/build_doc.pl
tools/check-doc.pl
tools/config.pl
tools/convert_itemtype.pl
tools/convert_monstermode.pl
tools/convert_sql.pl
tools/mapreg-converter.php
tools/rA_Common.pm
tools/setup_perl.sh
tools/stackdump
tools/update.pl
uninstall.sh
vcproj-10/char-server.vcxproj
vcproj-10/char-server.vcxproj.filters
vcproj-10/login-server.vcxproj
vcproj-10/login-server.vcxproj.filters
vcproj-10/map-server.vcxproj
vcproj-10/map-server.vcxproj.filters
vcproj-10/mapcache.vcxproj
vcproj-10/mapcache.vcxproj.filters
vcproj-12/char-server.vcxproj
vcproj-12/char-server.vcxproj.filters
vcproj-12/login-server.vcxproj
vcproj-12/login-server.vcxproj.filters
vcproj-12/map-server.vcxproj
vcproj-12/map-server.vcxproj.filters
vcproj-12/mapcache.vcxproj
vcproj-12/mapcache.vcxproj.filters
vcproj-13/char-server.vcxproj
vcproj-13/char-server.vcxproj.filters
vcproj-13/login-server.vcxproj
vcproj-13/login-server.vcxproj.filters
vcproj-13/map-server.vcxproj
vcproj-13/map-server.vcxproj.filters
vcproj-13/mapcache.vcxproj
vcproj-13/mapcache.vcxproj.filters
vcproj-14/char-server.vcxproj
vcproj-14/char-server.vcxproj.filters
vcproj-14/login-server.vcxproj
vcproj-14/login-server.vcxproj.filters
vcproj-14/map-server.vcxproj
vcproj-14/map-server.vcxproj.filters
vcproj-14/mapcache.vcxproj
vcproj-14/mapcache.vcxproj.filters
vcproj-9/char-server.vcproj
vcproj-9/dbghelpplug.vcproj
vcproj-9/login-server.vcproj
vcproj-9/map-server.vcproj
vcproj-9/mapcache.vcproj
zlib1.dll
Please move or remove them before you merge.
Aborting


git did not exit cleanly (exit code 1) (8190 ms @ 24/11/2016 8:42:45:AM)