help Linux SVN Update

[azze25]

Hi there,

Every time I make an update on my rathena svn, there are always conflicts. Right, because I am modifying it specially the src and there is always a compilation error.

Let,s say there is a conflict on my src when updating it, what option should I choose to avoid compilation error, like (mf - mine full, df - diff full). Well of course, I want my edited src be as it is and it will not affect my compilation. Im kind of confused what option to choose when there are conflicts. anyone can help please? Thank you

[Jezu]

You should make a diff for your custom modification. It was intent to conflict when you've modified some files that was affecting in the update.