If you want, then you can also go through this linkThe article : "HowHow to Sync A Local & Remote WordPress Blog Using Version Control gives advice on how to Sync A Local & Remoteautomate sync between two instances (development, production) of a WordPress Blog Using Version Control" [http://wp.tutsplus.com/tutorials/how-to-sync-a-local-remote-wordpress-blog-using-version-control/]blog using Mercurial. Is mentions that for this scenario, Git and Mercurial are very similar.
For version control tutorial [Mercurial]Step 4 (Synchronizing The Databases) is of interest here.
The database content will be exported to a file that is tracked by the revision control. Each time we pull changes, the database content will be replaced by this file, making our database up-to-date.
Then, you can use this linkit elaborates on conflicts and the scripting part of the job.
There is a http://hginit.com/version control tutorial in Mercurial out there, if you're not familiar with it.