L2J Server

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...)

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

master has last release and develop has merged features.

So in a way the "Master" branch is like the old "Stable" and Develop is the work in progress stuff (old "BETA")?

Master is last cumulative release, but that does not mean its stable...

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?

Simply make a pull request from your repository and branch using l2jserver develop branch.

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

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