L2J Server

I just need to be sure im doing it right, cause i'd hate messing it up.

So i have added all my custom changes to the source files and then i hit the sync with rep.

Then the changes show up, i find the conflicts shown in red and i fix them. Q:( how i can know if my conflicts are fixed for sure? )

Then i hit the update all incoming changes. Q: (will my custom changes be merged with the new stuff here?)

I way I have to not overlook merges is to create a patch from the source and check those files that got customized and are changed in SVN.

Eclipse show logs on how many files have conflicts, and you can check synchronization logs to know which files failed to merge the changes.

The main idea is that your changes will remain, if Eclipse (or it's plugins) cannot merge the incoming new changes it will fail and let you know.

Incoming (non-conflicting) changes will definitely be merged with your changes correctly, SVN can handle that.
When you open a conflicting change, modify it to accomodate both incoming and your own changes, then save it, those changes will obviously stay, they won't disappear in thin air. Just don't forget to mark files as merged afterwards.

jurchiks wrote:Incoming (non-conflicting) changes will definitely be merged with your changes correctly, SVN can handle that.
When you open a conflicting change, modify it to accomodate both incoming and your own changes, then save it, those changes will obviously stay, they won't disappear in thin air. Just don't forget to mark files as merged afterwards.

thats what i did. thanks.