Collaborative Code Editing [closed]

Closed. This question does not meet Stack Overflow guidelines. It is not currently accepting answers.

---

We don’t allow questions seeking recommendations for books, tools, software libraries, and more. You can edit the question so it can be answered with facts and citations.

Closed 8 years ago.

Improve this question

I work for a small web development company (6 people) and we've been in the market for a new code editor/development environment for quite some time.

Currently, we're using Dreamweaver's (CS3) coding side for our site development. Each site's files is hosted on a Dreamhost ftp server. All 6 of us work on the same set of live files on the remote ftp server. Dreamweaver has a handy file locking functionality that prevents us from overwriting each others changes by keeping us out of the same files.

Now, we've found that this form of development allows for very rapid development and love how easy it is to get things done. However there are many things we don't like. One of which is Dreamweaver's code editor. We also don't like our lack of code history for each site.

Does anyone know of a good alternative to Dreamweaver that has similar file locking/ftp functionality?

If not, could you explain to me the best configuration of a source control system for our team? We're willing to look at GIT, Mercurial, and Subversion. The new system would ideally:

1). Support multiple different code editors on different operating systems. (Windows 1st choice.)

2). Be almost as easy and quick to push out code as currently.

3). Allow for working on the files outside of the office network.

4). Be inexpensive.

I'm probably just showing my ignorance of how to use a version control system, but it doesn't seem logical for each of us to have a testing server on our computers with every single site setup with our own test database... That's very time consuming

What's your solution to our problem? I think we'll either have to upgrade to the lat开发者_高级运维est version of Dreamweaver and stick with it forever, or we'll have to find some sort of ftp collaborative editor, or we'll have to implement version control.

Do the benefits of version control outweigh the extra amount of time it entails to push out code?

---

it doesn't seem logical for each of us to have a testing server on our computers with every single site setup with our own test database... That's very time consuming

That's generally the way to do it. Most modern frameworks will let you set up your development server in minutes, if not seconds -- using an embedded http server and database, for example. If you are stuck on an ancient platform, there are solutions like wamp that are only a little more difficult. Remember, that it's time that you spend once, but it lets you be faster. If the project is going to take any longer than a few hours, it should be beneficial. You don't waste time on debugging things your fellow developer just changed, or recovering production data from that silly database manipulation mistake you just made.

(Oh, and if your websites are just HTML+JavaScript, then you don't need any server locally, obviously.)

As for version control systems, the ones you mentioned are fine, with SVN requiring a little more setup and network access to the central server for commits. Git and Mercurial let you work and commit offline, and then push your changes to the central server or even just exchange them between developers. I think Mercurial works better on Windows at the moment.

---

Michael I hear your pain.

I can't claim to have fully researched all avenues, but I have really begun to love Git recently.

My first hurdle was learning about how Revision Control Systems (RCS) work. Before I would pick SVN vs Git vs HG vs Bazzar vs etc I evaluated what I wanted to do. And that was to work locally then share my work, and push to a webserver.
I found this great comparison website: http://whygitisbetterthanx.com

From that I could clearly see that Git was worth the time to learn. As the backwards learner I am I dove into a project and learned how quickly things could become messy, then I began reading: http://gitready.com/ and http://book.git-scm.com/ and http://progit.org/book/

Then I realized I needed an organizational strategy. I went searching and found something I (and a lot of others) liked: http://nvie.com/posts/a-successful-git-branching-model/

This is also a great resource: http://danielmiessler.com/study/git/

---

There's a bit of a primer. Let me try to answer your questions more directly.

1.) Git is a command-line tool. For windows there's cygwin. I found the documentation at github to be the best. Even if you don't plan on using them for code hosting. Have a look at http://help.github.com/ Use the setup git link to get started.

2.) Since you ask for versioning there is a bit more work. Its a different model, a different way of thinking. Rather than not be able to edit the file which is currently what happens, your commits might collide, and in that case git provides great diff tools to help resolve the conflict.

3.) Git is whats called a DCVS or distributed version control system. Here's an example: lets say you need to do some work over the weekend. You do a git pull from the server before you leave work. At home you can continue to work, create new branches etc. Then when you have an internet connection you can push your changes back to the server.

4.) Git is free!

As for pushing your work to the webserver you'll need to setup something like this: http://toroid.org/ams/git-website-howto
Looks pretty easy, I'm gonna try it out next weekend.

I hope you find some of what I wrote helpful, if not maybe the links are.