LxCenter Forum: Kloxo Development » Git fork, branches etc.

HyperVM & Kloxo Support

Forum

Members

Help

Home

Home » Development Forums » Kloxo Development » Git fork, branches etc.(maintaining my own version)

Show: Today's Messages :: Show Polls :: Message Navigator

Git fork, branches etc. [message #94007]

Wed, 11 January 2012 15:47

com2

Messages: 1120
Registered: August 2007
Location: Spain

Senior Master
Developer

I forked my github version of Kloxo. I cloned my fork with PHPStorm unto my computer and opened it. In the branche information on Github I only found two, master and dev. Is that the equivalent of branches 6.1.x and trunk? How would you get an older version say 6.1.5? Shouldn't there be branches for them too?

What I try to do is make a version that includes already some features that I cannot wait for 6.2 to come out. How would you do that?

Report message to a moderator

Re: Git fork, branches etc. [message #94008 is a reply to message #94007]

Wed, 11 January 2012 16:06

shazar

Messages: 1856
Registered: May 2011

Grandmaster
LxCenter Core Team Member
LxCenter Representative

Each developer will have a clone as you do and will push to the dev. dev will then be used to test against and then pull requests will be made to have a core member pull it to the master. The master will then be used to base a release on.

You can use your clone for anything you want. If you make a patch that you want to go to dev, you can push it to dev. If you make something that is sort of out there and may not be ready or needed by the masses you can keep it. If someone sees a patch that they like in your clone, they could take that patch and update their own installation of Kloxo.

https://www.mercuryvps.com
HyperVM Xen VPS hosting

Report message to a moderator

Re: Git fork, branches etc. [message #94018 is a reply to message #94008]

Thu, 12 January 2012 03:55

com2

Messages: 1120
Registered: August 2007
Location: Spain

Senior Master
Developer

I still don't know (you did not confirm nor deny my presuppositions) what is presently master? Is master the previous 6.1.x? Is dev the previous trunk? Since I don't see any branches except master and dev, how can I set it to the latest release and apply my patch there? All the previous branch info seems to be missing. I think the Git repo is incomplete without it.

Looking at the context menu Git > Repositories > Branches I see: