No more master?
Forum rules
READ NOW: L2j Forums Rules of Conduct
READ NOW: L2j Forums Rules of Conduct
-
- Posts: 582
- Joined: Mon Jun 20, 2011 2:40 pm
- Contact:
No more master?
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...)
- maneco2
- Initiates
- Posts: 664
- Joined: Sat Aug 24, 2013 7:10 am
Re: No more master?
Now HighFive is: develop Branchsahar 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...)
- Zoey76
- L2j Inner Circle
- Posts: 7005
- Joined: Tue Aug 11, 2009 3:36 am
Re: No more master?
master has last release and develop has merged features.
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!
-
- Advanced User
- Posts: 1440
- Joined: Wed Apr 15, 2009 10:07 am
Re: No more master?
So in a way the "Master" branch is like the old "Stable" and Develop is the work in progress stuff (old "BETA")?
- Aikimaniac
- L2j Inner Circle
- Posts: 3048
- Joined: Sun Aug 07, 2005 11:42 pm
- Location: Slovakia
- CostyKiller
- Posts: 220
- Joined: Mon Aug 10, 2009 11:48 pm
- Location: Romania
Re: No more master?
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?
It's possible with rebase command?
-
- Advanced User
- Posts: 1026
- Joined: Thu Aug 14, 2014 6:31 am
Re: No more master?
Simply make a pull request from your repository and branch using l2jserver develop branch.
- UnAfraid
- L2j Veteran
- Posts: 4199
- Joined: Mon Jul 23, 2007 4:25 pm
- Location: Bulgaria
- Contact:
Re: No more master?
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
- CostyKiller
- Posts: 220
- Joined: Mon Aug 10, 2009 11:48 pm
- Location: Romania
Re: No more master?
Thanks UnAfraid, it worked fine, I had some conflicts but I fixed them easily.