search

jamiewaese / ePlant

ePlant is a data visualization tool for integrating and exploring multiple levels of biological data.
MIT License
2 stars 1 forks source link

Establish protocol for collaborative editing, posting to a dev site, and posting to a live site. #20

Closed jamiewaese closed 10 years ago

jamiewaese commented 11 years ago

As we go along we're going to want two versions of the site -- a dev site for tinkering and a live site that mostly works so we can show interested parties as needed.

We also need to figure out a protocol for collaborative editing. I made some tweaks to the index file on GitHub but noticed the file wasn't the same as the one online -- it didn't have the "Get Data" button.

We should figure out the most efficient way for Asher and I to make edits, confirm they're safe, and incorporate them in the next build.

It's my first time doing this so any suggestions would be most welcome!

yuzhenmi commented 11 years ago

I guess we can have the /~eplant version for development. The live version can go under bar.utoronto.ca/eplant to replace the old version (I doubt anyone uses that anyway..?).

Editing the files locally will not automatically update the files on GitHub. You have to either use their client or use command prompt to commit the changes to the online server. With the client, just commit and sync. I don't know how to use the command line version though. With this system, you can commit changes once they are somewhat stable (not when half a line of code is added, or something).

jamiewaese commented 11 years ago

Can I also just edit the file via the editor in their website?

When I commit, do those changes take immediately or do you get a chance to review them?

On Oct 4, 2013, at 8:53 PM, Hans Yu notifications@github.com wrote:

I guess we can have the /~eplant version for development. The live version can go under bar.utoronto.ca/eplant to replace the old version (I doubt anyone uses that anyway..?).

Editing the files locally will not automatically update the files on GitHub. You have to either use their client or use command prompt to commit the changes to the online server. With the client, just commit and sync. I don't know how to use the command line version though. With this system, you can commit changes once they are somewhat stable (not when half a line of code is added, or something).

— Reply to this email directly or view it on GitHub.

yuzhenmi commented 11 years ago

You can definitely edit the file on their website. The commits done using the client will not go online until you hit the Sync button. On their website, I think the changes take effect immediately after you hit commit.

You can undo changes but I think there will always be a record of everything you commit (and synced). This is for the best because it gives you the most security when there are multiple people editing the code.

jamiewaese commented 11 years ago

Have you set the Sync to automatically update our dev site? That would be quite ingenious if it works.

On Oct 5, 2013, at 12:01 AM, Hans Yu notifications@github.com wrote:

You can definitely edit the file on their website. The commits done using the client will not go online until you hit the Sync button. On their website, I think the changes take effect immediately after you hit commit.

You can undo changes but I think there will always be a record of everything you commit (and synced). This is for the best because it gives you the most security when there are multiple people editing the code.

— Reply to this email directly or view it on GitHub.

yuzhenmi commented 11 years ago

The sync would be between your computer with GitHub. I'm not sure how to sync between GitHub and BAR, but I think it would be BAR updating GitHub instead of the other way around, since GitHub keeps track of changes whereas BAR doesn't. We would probably need a script to sync GitHub with BAR.

Edit: there seems to be a pull command for git, which syncs local files with GitHub.