Page 1 of 1
how update revision?
Posted: Wed Jun 10, 2015 4:25 pm
by 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.
Re: how update revision?
Posted: Thu Jun 11, 2015 6:12 am
by Zoey76
Re: how update revision?
Posted: Thu Jun 11, 2015 7:20 am
by KGB1st
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
Re: how update revision?
Posted: Thu Jun 11, 2015 7:57 am
by KGB1st
Do I understand correctly that where I underlined red it's version of branches?
Re: how update revision?
Posted: Fri Jun 12, 2015 4:28 am
by Zoey76
You right click each conflicted file, Team -> Merge Tool and solve the conflict like SVN conflicts.
Re: how update revision?
Posted: Fri Jun 12, 2015 1:52 pm
by KGB1st
Zoey76 wrote: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
