[Help] ECLIPSE update to latest rev error

[Tokenlt]

Hello,

 

So i have rev 905, I use team>>update to HEAD to get rev 911. But after update is complete console shows 3 file conflicts and in file L2PcInstance.java, VIP.java, GameServer.java I get a lot of errors. What is wrong here??? Also 3 strange files apear near VIP.java: VIP.java.mine, VIP.java.r905 and, VIP.javar911. P.S. it's L2jFrozen.

 

 

 

[An4rchy]

First of all, what are those: VIP.java.mine, VIP.java.r905 and, VIP.javar911 :S ???

 

Plus, hold your mouse a little bit on the red lines to see the error, because you don't show enough information.

[Tokenlt]

Ok i figured it out, you need to press team>> edit conflicts. And edit code manual :)