My last changes was in May
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.
When I tried to sync in bitbuket I got error about many conflicts.. thanks for your help to me
How update my old branch?
Forum rules
READ NOW: L2j Forums Rules of Conduct
READ NOW: L2j Forums Rules of Conduct
-
- Advanced User
- Posts: 1440
- Joined: Wed Apr 15, 2009 10:07 am
Re: How update my old branch?
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.
- KGB1st
- Posts: 230
- Joined: Sat Jul 26, 2014 5:58 pm
Re: How update my old branch?
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
- KGB1st
- Posts: 230
- Joined: Sat Jul 26, 2014 5:58 pm
Re: How update my old branch?
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_
- KGB1st
- Posts: 230
- Joined: Sat Jul 26, 2014 5:58 pm
Re: How update my old branch?
emmm, what?! Finded some solution https://confluence.atlassian.com/bitbuc ... 14003.html may be solved, not sure
-
- Advanced User
- Posts: 1440
- Joined: Wed Apr 15, 2009 10:07 am
Re: How update my old branch?
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.
- KGB1st
- Posts: 230
- Joined: Sat Jul 26, 2014 5:58 pm
Re: How update my old branch?
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!!!!
- KGB1st
- Posts: 230
- Joined: Sat Jul 26, 2014 5:58 pm
Re: How update my old branch?
thx, done.JMD wrote: ↑Wed Jul 26, 2017 11:53 amIf 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.
- KGB1st
- Posts: 230
- Joined: Sat Jul 26, 2014 5:58 pm
Re: How update my old branch?
One can't understood. Why In merge 3 branche, is 2 of them not equals?
omg nothing to understand with this fkng git tech.. f..
hmmm> origin/l2j_datapack/develop
and
>l2j_datapack/develop
omg nothing to understand with this fkng git tech.. f..
You do not have the required permissions to view the files attached to this post.