how update revision?

[KGB1st]

Sorry me for my stupid question. But with svn I know how I can do it. In git I'm newbie. Can somebody help me and tell how I can compare my (last downloaded) server with last (mster on git) server revision. Thanks.

[Zoey76]

viewtopic.php?f=29&t=30453&p=182222#p182221

[KGB1st]

viewtopic.php?f=29&t=30453&p=182222#p182221

It has been read. But it's full update. I need to compare old version (which's last imported) and new master (from git)

Yesterday I have been add some fix, and today I have got error when pressed pull.

Code: Select all

Checkout conflict with files: 
L2J_Server/java/com/l2jserver/gameserver/idfactory/IdFactory.java
L2J_Server/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java

Code: Select all

Checkout conflict with files: 
L2J_Server/java/com/l2jserver/gameserver/idfactory/IdFactory.java
L2J_Server/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java

[KGB1st]

Do I understand correctly that where I underlined red it's version of branches?

[Zoey76]

You right click each conflicted file, Team -> Merge Tool and solve the conflict like SVN conflicts.

[KGB1st]

You right click each conflicted file, Team -> Merge Tool and solve the conflict like SVN conflicts.

Ok. Next time I will try, I have been updated my server manually yesterday