We moved our repositories to BitBucket!

If you can't login or you can't register to the forums do not rise an issue, instead please write to support (at) l2jserver.com

Check our wiki!

Report server issues here

Forum has been updated to phpBB 3.2, let's see if this fixes some minor bugs we had.

Thank you for visiting http://www.l2jserver.com/

How update my old branch?

If something doesn't fit in any other forum then post it here.
Forum rules
READ NOW: L2j Forums Rules of Conduct
Post Reply
User avatar
KGB1st
Posts: 223
Joined: Sat Jul 26, 2014 5:58 pm
Location: ИРК, РФ, СИБИРЬ!
Contact:

How update my old branch?

Post by KGB1st » Wed Jul 26, 2017 10:42 am

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:

User avatar
JMD
Advanced User
Advanced User
Posts: 1413
Joined: Wed Apr 15, 2009 10:07 am
Contact:

Re: How update my old branch?

Post by JMD » 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.

User avatar
KGB1st
Posts: 223
Joined: Sat Jul 26, 2014 5:58 pm
Location: ИРК, РФ, СИБИРЬ!
Contact:

Re: How update my old branch?

Post by KGB1st » 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

User avatar
KGB1st
Posts: 223
Joined: Sat Jul 26, 2014 5:58 pm
Location: ИРК, РФ, СИБИРЬ!
Contact:

Re: How update my old branch?

Post by KGB1st » Wed Jul 26, 2017 10:59 am

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_

User avatar
KGB1st
Posts: 223
Joined: Sat Jul 26, 2014 5:58 pm
Location: ИРК, РФ, СИБИРЬ!
Contact:

Re: How update my old branch?

Post by KGB1st » Wed Jul 26, 2017 11:03 am

emmm, what?! Finded some solution https://confluence.atlassian.com/bitbuc ... 14003.html may be solved, not sure

User avatar
JMD
Advanced User
Advanced User
Posts: 1413
Joined: Wed Apr 15, 2009 10:07 am
Contact:

Re: How update my old branch?

Post by JMD » 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.

User avatar
KGB1st
Posts: 223
Joined: Sat Jul 26, 2014 5:58 pm
Location: ИРК, РФ, СИБИРЬ!
Contact:

Re: How update my old branch?

Post by KGB1st » Wed Jul 26, 2017 11:55 am

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!!!!

User avatar
KGB1st
Posts: 223
Joined: Sat Jul 26, 2014 5:58 pm
Location: ИРК, РФ, СИБИРЬ!
Contact:

Re: How update my old branch?

Post by KGB1st » Wed Jul 26, 2017 11:57 am

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

User avatar
KGB1st
Posts: 223
Joined: Sat Jul 26, 2014 5:58 pm
Location: ИРК, РФ, СИБИРЬ!
Contact:

Re: How update my old branch?

Post by KGB1st » Wed Jul 26, 2017 1:40 pm

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:
You do not have the required permissions to view the files attached to this post.

valentind25
Posts: 1
Joined: Thu May 30, 2019 4:58 am

Re: How update my old branch?

Post by valentind25 » Thu May 30, 2019 5:01 am

KGB1st wrote:
Wed Jul 26, 2017 11:55 am
nothing to understand in this guide, so I fix it by my old style method Stockage Mobile.. 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!!!!
You can also see the side of youtube because I'm sure there are some that might interest you.

Post Reply