up vote 1 down vote favorite
share [g+] share [fb]

A co-worker and I are required to build an HTML based website (no PHP, no ASP.net, etc.). Is there anyway for us to work in the same files/projects across our LAN? Live edits would be the best, any other system would be acceptable, however.

link|improve this question
100% accept rate
1  
Are you looking for collaborative live editing software, or information around version control? You could use a local git or svn or mercurial repository and that would help resolve edit confilcts, but that wouldn't be the same as simultaneous collaborative editing. – sbtkd85 Sep 12 '11 at 14:49
Just out of curiosity, how do these systems prevent edit conflicts? I might just ask you to post this as an answer :) – Xander Lamkins Sep 12 '11 at 14:56
feedback

1 Answer

up vote 5 down vote accepted

I'd suggest using Version Control software, specifically I like git. Basically, by using source control, both of you can edit files, and if you happen to make edits on the same file that conflict, the VCS will let you know and allow you to manually merge the changes. For most edits, the software is pretty good at automatically merging changes you both make. It'll make sure you don't destory each other's work, and make it easy to revert back to an earlier version of the files (website in this case) in case you mess something up. Also you can use branching to test out different ideas/features and and merge them back to the mainline if you like them/they work.

Other VCS include Mercurial and Subversion (there are many more). I'd recommend git because it has decent cross-platform support, well documented, and well used, so it's pretty easy to find some good guides/help for it. Here are a few:

link|improve this answer
2  
This pretty much sums it up, except that for beginner, really small projects (2 people in this case, only HTML) I would recommend subversion with TortoiseSVN. I find that it's easier for people to grasp, and the nice explorer extensions mean that you don't have to worry about using the command line. – Kibbee Sep 12 '11 at 15:53
I would suggest having it hosted on one of the free sites such as Assembla. It's easier to set up, they take care of backups, and you can use it from anywhere. – Jeanne Pindar Sep 12 '11 at 18:21
feedback

Your Answer

 
or
required, but never shown
discard

Not the answer you're looking for? Browse other questions tagged or ask your own question.