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