No more master?

This is not a Support area! Discuss about the Server here. Non-Server related discussion goes in Off-Topic Discussion.
Forum rules
READ NOW: L2j Forums Rules of Conduct
Post Reply
sahar
Posts: 582
Joined: Mon Jun 20, 2011 2:40 pm
Contact:

No more master?

Post by sahar »

Just to make sure, https://github.com/L2J/L2J_Server/commits/master has moved to https://github.com/L2J/L2J_Server/commits permamently? (same for dp...)
User avatar
maneco2
Initiates
Initiates
Posts: 664
Joined: Sat Aug 24, 2013 7:10 am

Re: No more master?

Post by maneco2 »

sahar wrote:Just to make sure, https://github.com/L2J/L2J_Server/commits/master has moved to https://github.com/L2J/L2J_Server/commits permamently? (same for dp...)
Now HighFive is: develop Branch
User avatar
Zoey76
L2j Inner Circle
L2j Inner Circle
Posts: 7005
Joined: Tue Aug 11, 2009 3:36 am

Re: No more master?

Post by Zoey76 »

master has last release and develop has merged features.
Powered by Eclipse 4.30 🌌 | Eclipse Temurin 21 ☕ | MariaDB 11.2.2 🗃️ | L2J Server 2.6.3.0 - High Five 🚀

🔗 Join our Discord! 🎮💬
JMD
Advanced User
Advanced User
Posts: 1440
Joined: Wed Apr 15, 2009 10:07 am

Re: No more master?

Post by JMD »

So in a way the "Master" branch is like the old "Stable" and Develop is the work in progress stuff (old "BETA")?
User avatar
Aikimaniac
L2j Inner Circle
L2j Inner Circle
Posts: 3048
Joined: Sun Aug 07, 2005 11:42 pm
Location: Slovakia

Re: No more master?

Post by Aikimaniac »

Master is last cumulative release, but that does not mean its stable...
Image
User avatar
CostyKiller
Posts: 220
Joined: Mon Aug 10, 2009 11:48 pm
Location: Romania

Re: No more master?

Post by CostyKiller »

How can we switch from master branch to develop branch without losing the changes we made to our local source?
It's possible with rebase command?
Sacrifice
Advanced User
Advanced User
Posts: 1026
Joined: Thu Aug 14, 2014 6:31 am

Re: No more master?

Post by Sacrifice »

Simply make a pull request from your repository and branch using l2jserver develop branch.
User avatar
UnAfraid
L2j Veteran
L2j Veteran
Posts: 4199
Joined: Mon Jul 23, 2007 4:25 pm
Location: Bulgaria
Contact:

Re: No more master?

Post by UnAfraid »

You can merge develop branch into your current one, get git repo view expand it and u'll see 'branches' expand it select origin/develop and right click merge will merge all commits into your current you may have to fix some conflicts in case there are
Image
User avatar
CostyKiller
Posts: 220
Joined: Mon Aug 10, 2009 11:48 pm
Location: Romania

Re: No more master?

Post by CostyKiller »

Thanks UnAfraid, it worked fine, I had some conflicts but I fixed them easily.
Post Reply