Marked, on 17 July 2012 - 03:24 AM, said:
Is it possible to set up some kind of sync between the two computers? Eg if I make a file in my htdocs folder (I use xampp) then it be there on my laptop. And similarly for databases.
Git, or a similar distributed source code management system like Mercurial, will certainly allow you to synchronise your files with a lot more ease than anything else. Because it's distributed, you don't need a central repository if one doesn't already exist, and you can easily sync your code between your machines with an SSH session. Cygwin and Git Bash may be of use here, since you mentioned you're using a Windows system (unlucky

).
Cyril, on 17 July 2012 - 03:29 AM, said:
Dropbox, or the like.
You could also rsync to a server using a cronjob. Didn't read the part about Windows 7.
Rsync is still an option, but this isn't what it's designed for. It doesn't have any coherent means of merging changes between two different versions of a file, and doing it on a cron job will probably overwrite your changes in the files you're working with. This would certainly make for some interesting debugging sessions
gibbonweb, on 17 July 2012 - 04:09 AM, said:
git to sync a database file? I don't want to be the one having to merge those diffs

For everything else: git, of course.
For our PHP projects where the applications' database management tools are useless, we've been using a tool called Flyway which essentially allows you to version pure SQL files. It's relatively simple (best suited to Java projects, but with a few modifications it works perfectly with our build scripts), but it allows us to diff pure SQL dumps. If you've ever worked with XMLDB in Moodle, you'll understand why it's the lesser evil