search

GlimmerLabs / MathOverImages

A language and ecosystems for doing math over abstract images.
GNU Lesser General Public License v3.0
4 stars 3 forks source link

Rethink dev setup #9

Closed rebelsky closed 10 years ago

rebelsky commented 10 years ago
  1. Need a mist account that the regular server runs on. (There's too much configured in the glimmer account.)
  2. That account should be working with the main branch, rather than the dev branch.
  3. But that means that all the work in the dev branch needs to be put back into the main branch.
  4. At this stage, we should be doing small, local, branches that we quickly merge into the main branch, rather than having a large dev branch.
alexthemitchell commented 10 years ago

I agree completely. As noted in Version Control by Example, having the main branch be the true dev branch, and having separate branches for releases makes more sense, and is more typical.

alexthemitchell commented 10 years ago

I'll let you merge the branches, and redeploy with this setup, so I don't mess it up again.

rebelsky commented 10 years ago

Use the mist account on glimmer.grinnell.eduhttp://glimmer.grinnell.edu for running nodejs. Do not commit or push from that account.

Use port 80.

See if you can get apache on another port.

-- SamR Sent from my so-called "smart phone"

On Jun 30, 2014, at 9:18 AM, "Alex Mitchell" notifications@github.com<mailto:notifications@github.com> wrote:

I'll merge the branches, and redeploy with this setup.

Reply to this email directly or view it on GitHubhttps://github.com/GlimmerLabs/MathOverImages/issues/9#issuecomment-47536622.

alexthemitchell commented 10 years ago

With feee210652e39335f20455d3542aabaaf0d5561a, we merged the branches. @wheelere is now working on changing apache port.