search

js3d / acorn

A cross-platform 3D game engine written in JavaScript.
2 stars 0 forks source link

I don't understand what the branches we have are and mean. #5

Closed adam-zethraeus closed 1 year ago

adam-zethraeus commented 11 years ago

I don't understand what the branches we have are and mean.

Dave, could you fill this in a bit? https://github.com/vorporeal/acorn/wiki/Branch-Usage

vorporeal commented 11 years ago

Sure. Those were basically personal working branches that I was syncing between my machines using this repository. I'll make a personal fork of this repo and transition the branches over there. I'll try to get to it tonight, if not, this weekend.

vorporeal commented 11 years ago

I suggest the main repo (at least for now) only have master and a development branch (next/latest/nightly). Reviewed and approved code can be merged into the development branch, and we can cut "releases" to master.

adam-zethraeus commented 11 years ago

Sounds good. Also sounds like we'de be using bonafide pull requests from our own forks. (Is it easy to keep those synchronized with dev?). In which case it sounds like that would end up a decent CR method.

pbwilmot commented 11 years ago

we can also do merges into master with git patches like a real open source project :-p

On Thu, Dec 6, 2012 at 11:06 AM, Adam Zethraeus notifications@github.comwrote:

Sounds good. Also sounds like we'de be using bonafide pull requests from our own forks. (Is it easy to keep those synchronized with dev?). In which case it sounds like that would end up a decent CR method.

— Reply to this email directly or view it on GitHubhttps://github.com/vorporeal/acorn/issues/5#issuecomment-11099005.

Peter Wilmot

vorporeal commented 11 years ago

Adam, when you have 15 minutes, send me a message and we can quickly figure out how to deal with branches/repos/forking/pull requests.