Page 1 of 1

How update my old branch?

Posted: Wed Jul 26, 2017 10:42 am
by KGB1st
My last changes was in May
Image

Now I see that guys make many usefull fixes and want to merge this with my rep. But I don't understand how I must do this.
Image

When I tried to sync in bitbuket I got error about many conflicts.. thanks for your help to me :+1:

Re: How update my old branch?

Posted: Wed Jul 26, 2017 10:47 am
by JMD
Do you have many customs? One way is to make patches of your custom stuff and then apply them on a fresh source and fix whatever conflicts.

Re: How update my old branch?

Posted: Wed Jul 26, 2017 10:50 am
by KGB1st
JMD wrote: Wed Jul 26, 2017 10:47 am Do you have many customs? One way is to make patches of your custom stuff and then apply them on a fresh source and fix whatever conflicts.
yes? but I don't know, how I can to wach what files are in conflicts?

P.S. _server hasn't a lot of changes, only agro/passive aura for mobs, many changes I did in _datapack

Re: How update my old branch?

Posted: Wed Jul 26, 2017 10:59 am
by KGB1st
I know one way how to view conflicts, but it's in web application, on bitbucket.. I tthink somebody know how do same in git bush_

Re: How update my old branch?

Posted: Wed Jul 26, 2017 11:03 am
by KGB1st
emmm, what?! Finded some solution https://confluence.atlassian.com/bitbuc ... 14003.html may be solved, not sure

Re: How update my old branch?

Posted: Wed Jul 26, 2017 11:53 am
by JMD
KGB1st wrote: Wed Jul 26, 2017 10:50 am
JMD wrote: Wed Jul 26, 2017 10:47 am Do you have many customs? One way is to make patches of your custom stuff and then apply them on a fresh source and fix whatever conflicts.
yes? but I don't know, how I can to wach what files are in conflicts?

P.S. _server hasn't a lot of changes, only agro/passive aura for mobs, many changes I did in _datapack
If you use my advice and make patches of your custom stuff. When you will apply them to the new source it will show you what lines are wrong etc. and you can fix them manually.

Re: How update my old branch?

Posted: Wed Jul 26, 2017 11:55 am
by KGB1st
nothing to understand in this guide, so I fix it by my old style method.. start to merge and view waht files in conflict, after must did a commit to rep. After this I can use new develop revision. Thanks for l2j for great work. Like you!!!!

Re: How update my old branch?

Posted: Wed Jul 26, 2017 11:57 am
by KGB1st
JMD wrote: Wed Jul 26, 2017 11:53 am
KGB1st wrote: Wed Jul 26, 2017 10:50 am
JMD wrote: Wed Jul 26, 2017 10:47 am Do you have many customs? One way is to make patches of your custom stuff and then apply them on a fresh source and fix whatever conflicts.
yes? but I don't know, how I can to wach what files are in conflicts?

P.S. _server hasn't a lot of changes, only agro/passive aura for mobs, many changes I did in _datapack
If you use my advice and make patches of your custom stuff. When you will apply them to the new source it will show you what lines are wrong etc. and you can fix them manually.
thx, done.
Image

Re: How update my old branch?

Posted: Wed Jul 26, 2017 1:40 pm
by KGB1st
One can't understood. Why In merge 3 branche, is 2 of them not equals? :shifty:
> origin/l2j_datapack/develop
and
>l2j_datapack/develop
hmmm

omg nothing to understand with this fkng git tech.. f.. :problem: