Jump to content
  • 0

Updating GIT files

kitty14

Asked by kitty14,

 Share

Question

kitty14 Drops

kitty14

Posted
  • Group:  Members
  • Topic Count:  103
  • Topics Per Day:  0.03
  • Content Count:  323
  • Reputation:   4
  • Joined:  12/09/13
  • Last Seen:  
Posted (edited)

Hello, newbie in updating Git Files here /heh
need further explanation or example here Im kinda slow. ahahah

Conflicts
It's possible that you'll run into conflicts along the way, with messages such as:
 
Quote
CONFLICT (content): Merge conflict in src/map/atcommand.c
 
When you see these messages, a conflict in merging your code occurred.  Much like resolving code conflicts in SVN, these conflicts create points within the files which show your code compared to the code pulled from the remote repo.  To fix them, open your files and find the conflict locations denoted by:
 
Quote
<<<<<<<: Indicates the start of the lines that had a merge conflict.

=======: Indicates the break point used for comparison. Breaks up changes that user has committed (above) to changes coming from merge (below) to visually see the differences.

>>>>>>>: Indicates the end of the lines that had a merge conflict.

and yes i found clonflict in group.conf and mob_db.txt
 

can_trade_bounded: true
item_unconditional: false
<<<<<<< Updated upstream
bypass_stat_onclone: true
bypass_max_stat: true
=======
view_equipment: true
>>>>>>> Stashed changes
/* all_permission: true */

<<<<<<< Updated upstream
//3201,JT_LUCKYCASE,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3202,ORGANIC_JAKK,Organic Pumpkin,Organic Pumpkin,10,40,1,20,13,1,100,100,160,99,1,1,1,1,999,1,0,0,0,3,21,0x61,200,0,0,0,0,0,0,0,0,0,0,6804,5000,6804,5000,6804,1000,2267,100,1062,1000,664,100,546,1000,12192,100,0,0,0,0
3203,INORGANIC_JAKK,Inorganic Pumpkin,Inorganic Pumpkin,10,40,1,20,13,1,100,100,160,99,1,1,1,1,999,1,0,0,0,3,21,0x61,200,0,0,0,0,0,0,0,0,0,0,6805,5000,6805,5000,6805,1000,2267,100,1062,1000,664,100,546,1000,12192,100,0,0,0,0
//3204,JT_PIXY_PINK_PORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//3205,JT_PIXY_BLUE_PORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//3206,JT_LITTLE_GOLDPORING,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//3207,JT_E_AQUA_ELEMENTAL,Poring,Poring,1,60,1,27,20,1,8,9,2,5,6,1,1,0,6,5,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//
//3295,JT_G_MOBSTER
//3296,JT_HIDDEN_TEST
//3297,JT_PAD_LEVIATHAN
//3299,JT_PAD_IFRIT
//3300,JT_PAD_HORAI
//3301,JT_PAD_SHANGRILA
//3302,JT_PAD_NIRAIKANAI
//3303,JT_PAD_HELHEIM
//3304,JT_PAD_MUSPELHEIM
//3305,JT_PAD_ZAEROG
//3306,JT_PAD_TAMADORA
//3307,JT_PAD_TAMADORABABY
//3308,JT_ROC_EMPELIUM
//3309,JT_ROC_OBJ_A
//3310,JT_ROC_OBJ_B
//3311,JT_ROC_OBJ_N
//3312,JT_ROC_TOWER_A
//3313,JT_ROC_TOWER_B
//3314,JT_SMOKIE_THIEF
//3315,JT_PAD_KINGGOLD
//3316,JT_PAD_KINGMETAL
//3317,JT_PAD_RUBYLIT
//3318,JT_PAD_SAPPHILIT
//3319,JT_PAD_EMELIT
//3320,JT_PAD_TOPALIT
//3321,JT_PAD_AMELIT
//3322,JT_PAD_METAL_DRAGON
//3323,JT_PAD_M_FLAME_KNIGHT
//3324,JT_PAD_M_ICE_KNIGHT
//3325,JT_PAD_M_STONE_KNIGHT
//3326,JT_PAD_M_LIGHT_KNIGHT
//3327,JT_PAD_M_DARK_KNIGHT
//3328,JT_PAD_C_D_DRAGON
//3329,JT_PAD_ECHIDNA
//3330,JT_PAD_SIREN
//3331,JT_PAD_LILITH
//3332,JT_PAD_HERA
//3333,JT_PAD_RUBYLIT_H
//3334,JT_PAD_SAPPHILIT_H
//3335,JT_PAD_EMELIT_H
//3336,JT_PAD_TOPALIT_H
//3337,JT_PAD_AMELIT_H
//3338,JT_PAD_METAL_DRAGON_H
//3339,JT_PAD_M_FLAME_KNIGHT_H
//3340,JT_PAD_M_ICE_KNIGHT_H
//3341,JT_PAD_M_STONE_KNIGHT_H
//3342,JT_PAD_M_LIGHT_KNIGHT_H
//3343,JT_PAD_M_DARK_KNIGHT_H
//3344,JT_PAD_C_D_DRAGON_H
//3345,JT_PAD_ECHIDNA_H
//3346,JT_PAD_SIREN_H
//3347,JT_PAD_LILITH_H
//3348,JT_PAD_HERA_H
//3349,JT_PAD_MYTHLIT
//3350,JT_PAD_TYRRA
//3351,JT_PAD_TYRANNOS
//3352,JT_PAD_PLESSIE
//3353,JT_PAD_PLESIOS
//3354,JT_PAD_BRACHY
//3355,JT_PAD_BRACHYS
=======
//3201,JT_LUCKYCASE
//3202,JT_ORGANIC_JAKK
//3203,JT_INORGANIC_JAKK
//3204,JT_PIXY_PINK_PORING
//3205,JT_PIXY_BLUE_PORING
//3206,JT_LITTLE_GOLDPORING
//3207,JT_E_AQUA_ELEMENTAL
//custom
3230,BLUE_ZMEY_GORYNYCH,Blue Zmey Gorynych,Blue Zmey Gorynych,62,14211,0,7610,2826,1,824,1084,37,26,25,20,30,5,77,35,10,12,1,1,29,0x3695,175,2612,912,288,0,0,0,0,0,0,0,7071,4413,938,1500,958,1500,723,200,727,100,1260,1,2324,2,0,0,0,0,4274,1
3248,Dark_Poring,Dark Poring,Dark Poring,62,14211,0,7610,2826,1,824,1084,37,26,25,20,30,5,77,35,10,12,1,1,29,0x3695,175,2612,912,288,0,0,0,0,0,0,0,7071,4413,938,1500,958,1500,723,200,727,100,1260,1,2324,2,0,0,0,0,4274,1
3246,Cyber_Boot,Cyber_Boot,Cyber_Boot,62,14211,0,7610,2826,1,824,1084,37,26,25,20,30,5,77,35,10,12,1,1,29,0x3695,175,2612,912,288,0,0,0,0,0,0,0,7071,4413,938,1500,958,1500,723,200,727,100,1260,1,2324,2,0,0,0,0,4274,1
3226,Beast_Vicento,Beast_Vicento,Beast_Vicento,62,14211,0,7610,2826,1,824,1084,37,26,25,20,30,5,77,35,10,12,1,1,29,0x3695,175,2612,912,288,0,0,0,0,0,0,0,7071,4413,938,1500,958,1500,723,200,727,100,1260,1,2324,2,0,0,0,0,4274,1

//naruto
3233,Danzou,Danzou,Danzou,140,25000000,1,1160000,1800000,1,5597,10597,269,98,200,201,156,190,199,77,10,12,2,2,60,0x37B5,200,1020,1020,288,58000,1008,500,730,1000,1000,4000,1015,9700,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3247,Uchiha Madara,Uchiha Madara,Uchiha Madara,146,35000000,1,6696000,4860000,3,65375,12764,436,218,255,201,200,190,199,177,10,12,2,0,83,0x37B5,130,212,384,360,3348000,603,5500,617,5000,616,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

//,71,300000,1,116000,180000,1,630,1597,269,98,88,70,112,87,102,71,10,12,2,2,60,0x37B5,200,1020,1020,288,58000,1008,500,730,1000,1000,4000,1015,9700,1223,500,1236,150,1014,5000,2288,300,985,2900,13047,100,0,0,0,0,4121,1

//custom mobs current
//ID,Sprite_Name,kROName,iROName,LV,HP,SP,EXP,JEXP,Range1,ATK1,ATK2,DEF,MDEF,STR,AGI,VIT,INT,DEX,LUK,Range2,Range3,Scale,Race,Element,Mode,Speed,aDelay,aMotion,dMotion,MEXP,MVP1id,MVP1per,MVP2id,MVP2per,MVP3id,MVP3per,Drop1id,Drop1per,Drop2id,Drop2per,Drop3id,Drop3per,Drop4id,Drop4per,Drop5id,Drop5per,Drop6id,Drop6per,Drop7id,Drop7per,Drop8id,Drop8per,Drop9id,Drop9per,DropCardid,DropCardper
3222,Aposis,Aposis,Aposis,150,100390,1,50000000,55000000,2,7895,9307,141,68,199,119,72,85,220,72,10,12,2,0,63,0x37B5,160,140,384,288,0,0,0,0,0,0,0,732,3000,958,30,6223,10,2626,1,984,50,2621,1,0,0,0,0,0,0,0,0
3241,Clione,Clione,Clione,255,220390,1,3690,3768,1,19895,25307,141,68,199,119,72,85,220,72,10,12,0,6,22,0x191,200,1548,384,288,0,0,0,0,0,0,0,997,30,0,0,732,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

//255,2205000,10,2000000,2200000,3,289500,93070,588,506,220,150,150,300,199,156,10,12,2,8,86,0x37B5,100,576,576,480,1000000,617,5500,603,2000,616,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//3219,Crow,Crow,Crow,255,2205000,10,2000000,2200000,3,289500,93070,588,506,220,150,150,300,199,156,10,12,2,8,86,0x37B5,100,576,576,480,1000000,617,5500,603,2000,616,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//255,12039000,1,50000000,55000000,2,9895,15307,141,68,199,119,72,85,220,72,10,12,2,0,63,0x37B5,160,140,384,288,0,0,0,0,0,0,0,732,3000,958,30,6223,10,2626,1,984,50,2621,1,0,0,0,0,0,0,0,0
//1734,KIEL_,Kiel D-01,Kiel D-01,255,30205000,1,3000000,3200000,3,12937,16517,250,250,250,250,250,141,199,180,10,12,1,0,47,0x37B5,130,1152,576,432,900000,617,5500,603,5000,616,2000,7513,3000,617,3000,2651,1000,2319,1000,1618,500,1242,500,2650,1000,0,0,0,0,4403,1

3221,ADDAX,Addax,Addax,255,10500000,1,20000000,3200000,3,122937,156517,100,550,250,250,250,141,199,180,10,12,1,7,84,0x37B5,130,1152,576,432,900000,617,5500,603,5000,616,2000,0,0,617,3000,25110,2,2351,500,0,0,19210,3,7806,3,0,0,0,0,18200,1
3249,GREEN_TEEN_CHIPMUNK,Green Teen Chipmunk,Green Teen Chipmunk,255,10500000,1,3000000,3200000,3,82937,106517,100,550,250,250,250,141,199,180,10,12,1,2,82,0x37B5,130,1152,576,432,900000,617,5500,603,5000,616,2000,0,0,617,3000,8086,2,2349,500,0,0,19208,2,7806,3,0,0,0,0,18202,1
3218,Blue_Hell_Centaur,Blue Hell Centaur,Blue Hell Centaur,255,10500000,1,3000000,3200000,3,102937,136517,100,550,250,250,250,141,199,180,10,12,1,2,81,0x37B5,200,1152,576,432,900000,617,5500,603,5000,616,2000,0,0,617,3000,25112,2,0,0,0,0,19212,3,7806,3,0,0,0,0,18204,1
3250,FABILSAG,Fabilsag,Fabilsag,255,30000000,1,3000000,3200000,3,202937,256517,100,550,250,250,250,141,250,180,10,12,1,2,82,0x37B5,350,1152,576,432,900000,617,5500,603,5000,616,2000,0,0,617,3000,8046,2,0,0,0,0,19209,3,7806,4,0,0,0,0,18201,1

//3250,FABILSAG,Fabilsag,Fabilsag,255,12050000,100000,2000000,2200000,2,19895,20307,141,168,259,150,172,300,220,172,10,12,2,2,82,0x37B5,100,576,576,480,1000000,617,5500,603,5000,616,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18201,1
3239,CHARMANDER,Charmander,Charmander,126,43900,1,3690,3768,1,633,736,126,62,93,62,58,56,99,70,10,12,0,6,22,0x191,200,1548,384,288,0,0,0,0,0,0,0,997,30,1003,150,1040,5500,2286,1,6223,10,2124,3,1732,5,0,0,0,0,4434,1
3223,ARACHNE,Arachne,Arachne,100,30390,1,1800000,1440000,2,1399,1799,141,68,189,105,72,85,132,72,10,12,2,0,22,0x1181,160,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
3219,Crow,Crow,Crow,255,50655000,1,2700000,1890000,1,155375,182764,274,182,255,201,200,190,199,177,10,12,1,6,87,0x37B5,350,432,432,360,1350000,607,5500,617,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

3251,RED_HELL_CENTAUR,Red Hell Centaur,Red Hell Centaur,255,10500000,1,3000000,3200000,3,122937,156517,100,550,250,250,250,141,199,180,10,12,1,2,83,0x37B5,130,1152,576,432,900000,617,5500,603,5000,616,2000,0,0,617,3000,8077,2,0,0,0,0,19211,3,7806,3,0,0,0,0,25046,1

3252,OKTO,OKTO,OKTO,255,10500000,1,3000000,3200000,3,82937,106517,100,550,250,250,150,141,199,255,10,12,1,2,83,0x37B5,130,1152,576,432,900000,617,5500,603,5000,616,2000,0,0,617,3000,8081,2,0,0,0,0,0,0,7806,3,0,0,0,0,25049,1

3253,POSEIDON,POSEIDON,POSEIDON,255,10500000,3,3000000,3200000,3,122937,156517,100,150,250,250,250,141,199,180,10,12,1,2,81,0x37B5,130,1152,576,432,900000,617,5500,603,5000,616,2000,0,0,617,3000,25081,2,0,0,0,0,19213,3,7806,3,0,0,0,0,25047,1

3254,MOON_LADY,MOON_LADY,MOON_LADY,255,10500000,1,3000000,3200000,3,122937,156517,100,550,250,250,250,141,199,180,10,12,1,2,80,0x37B5,130,1152,576,432,900000,617,5500,603,5000,616,2000,0,0,617,3000,8128,5,0,0,0,0,0,0,7806,3,0,0,0,0,0,0

3255,PREDATOR,PREDATOR,PREDATOR,200,10500000,1,3000000,3200000,3,122937,156517,100,550,250,250,250,141,199,180,10,12,1,2,85,0x37B5,130,1152,576,432,900000,617,5500,603,5000,616,2000,0,0,617,3000,8056,2,0,0,0,0,0,0,7806,3,0,0,0,0,25051,1

3256,REQUI,REQUI,REQUI,255,10500000,1,3000000,3200000,3,122937,156517,100,550,250,250,250,141,199,180,10,12,1,2,88,0x37B5,230,1152,576,432,900000,617,5500,603,5000,616,2000,0,0,617,3000,25087,2,0,0,0,0,0,0,7806,3,0,0,0,0,25048,1

3257,SANTA_GIRL,SANTA_GIRL,SANTA_GIRL,255,10500000,1,3000000,3200000,3,122937,156517,100,550,250,250,250,141,199,180,10,12,1,2,81,0x37B5,130,1152,576,432,900000,617,5500,603,5000,616,2000,0,0,617,3000,8128,5,0,0,0,0,0,0,7806,4,0,0,0,0,25050,1
>>>>>>> Stashed changes 
2267,0,0,1,0,0,0,99,0,0,mado,0,0,6146,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2802						//NC_SELFDESTRUCTION
<<<<<<< Updated upstream
2268,0,0,100,0,0,0,99,0,0,mado,0,0,6360,1,6363,1,6362,1,6361,1,0,0,0,0,0,0,0,0,0,0,6146,2,2803			//NC_SHAPESHIFT
=======
2268,0,0,100,0,0,0,99,0,0,mado,0,0,6360,1,6363,1,6362,1,6361,1,6146,2,0,0,0,0,0,0,0,0,0,0,2803			//NC_SHAPESHIFT
>>>>>>> Stashed changes
2269,0,0,20,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2804						//NC_EMERGENCYCOOL
2270,0,0,45,0,0,0,99,0,0,mado,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0								//NC_INFRAREDSCAN
2271,0,0,30,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0							//NC_ANALYZE
2272,0,0,90,0,0,0,99,0,0,mado,0,0,6146,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2805						//NC_MAGNETICFIELD
2273,0,0,90,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2806						//NC_NEUTRALBARRIER
2274,0,0,100:150:200,0,0,0,99,0,0,mado,0,0,6146,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2808				//NC_STEALTHFIELD
<<<<<<< Updated upstream
2275,0,0,25:30:35:40:45,0,0,0,99,0,0,mado,0,0,12392,1,12392,1,12393,1,12393,1,12394,1,0,0,0,0,0,0,0,0,6146,1,2807			//NC_REPAIR
=======
2275,0,0,25:30:35:40:45,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2807			//NC_REPAIR
>>>>>>> Stashed changes
 

question, what changes do i need to do? how? cuz i didnt make any changes with those line , i did remove

<<<<<<<
=======

>>>>>>>
and  whats next command? is that all?. I'm stuck here.. been searching for more guides but couldn't find one.  login-server, char-server , and map-server gone.. please help Im confused. /wah

Edited by kitty14
Link to comment
Share on other sites

0 answers to this question

Recommended Posts

There have been no answers to this question yet

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Answer this question...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

×
 Share
Go to question listing
×
×
  • Create New...