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?)
Question regarding sync with rep on eclise.
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
Question regarding sync with rep on eclise.
Last edited by JMD on Tue Jun 18, 2013 4:10 am, edited 1 time in total.
- Zoey76
- L2j Inner Circle
- Posts: 7005
- Joined: Tue Aug 11, 2009 3:36 am
Re: Question regarding sync with rep on eclise.
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.
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.
Powered by Eclipse 4.30 | Eclipse Temurin 21 | MariaDB 11.3.2 | L2J Server 2.6.3.0 - High Five
Join our Discord!
Join our Discord!
- jurchiks
- Posts: 6769
- Joined: Sat Sep 19, 2009 4:16 pm
- Location: Eastern Europe
Re: Question regarding sync with rep on eclise.
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.
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.
If you have problems, FIRST TRY SOLVING THEM YOURSELF, and if you get errors, TRY TO ANALYZE THEM, and ONLY if you can't help it, THEN ask here.
Otherwise you will never learn anything if all you do is copy-paste!
Discussion breeds innovation.
Otherwise you will never learn anything if all you do is copy-paste!
Discussion breeds innovation.
-
- Advanced User
- Posts: 1440
- Joined: Wed Apr 15, 2009 10:07 am
Re: Question regarding sync with rep on eclise.
thats what i did. thanks.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.