From your first post it sounded as if you were many more than two involved. As you’re only two, don’t bother with GitHub or whatever … just use Dropbox or Cubby and with care you’ll be alright. As I said in
Cubby reports through Growl every time my collaborator’s work is saved to the server, so if I’m on my computer, every few minutes an alert pops up saying a file in the project has been changed, and when she logs out the user.lock file appears in my trash, so I always know when she’s working on it.
If you do try to open it when your collaborator is working on it, you’ll get an alert saying that the project is open on another computer and giving you the option to work on a copy. I’d resist that like the plague as you will be forking the project and marrying the two versions up would be a pain.
No, neither Cubby nor Dropbox mesh any changes. You can only work sequentially as I say above. That is going to be true whatever way you try to collaborate … unless you are willing to do the work and take the risks with GitHub as @glowkeeper in
