how update revision?
Forum rules
READ NOW: L2j Forums Rules of Conduct
READ NOW: L2j Forums Rules of Conduct
- KGB1st
- Posts: 230
- Joined: Sat Jul 26, 2014 5:58 pm
how update revision?
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
- L2j Inner Circle
- Posts: 7005
- Joined: Tue Aug 11, 2009 3:36 am
Re: how update revision?
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!
- KGB1st
- Posts: 230
- Joined: Sat Jul 26, 2014 5:58 pm
Re: how update revision?
It has been read. But it's full update. I need to compare old version (which's last imported) and new master (from git)Zoey76 wrote:viewtopic.php?f=29&t=30453&p=182222#p182221
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
- Posts: 230
- Joined: Sat Jul 26, 2014 5:58 pm
Re: how update revision?
Do I understand correctly that where I underlined red it's version of branches?
You do not have the required permissions to view the files attached to this post.
- Zoey76
- L2j Inner Circle
- Posts: 7005
- Joined: Tue Aug 11, 2009 3:36 am
Re: how update revision?
You right click each conflicted file, Team -> Merge Tool and solve the conflict like SVN conflicts.
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!
- KGB1st
- Posts: 230
- Joined: Sat Jul 26, 2014 5:58 pm
Re: how update revision?
Ok. Next time I will try, I have been updated my server manually yesterdayZoey76 wrote:You right click each conflicted file, Team -> Merge Tool and solve the conflict like SVN conflicts.