1) Use $ git merge to cleanly extract files from other branches. Not my tip - credit and full explanation here
This sounds really interesting: http://bit.ly/i5yk8o [Link to blog]
Info here: http://bit.ly/f2Qd9p
Since the WC3 has stopped maintaining their spec on web databases, it's time to look into what IS being maintained: IndexedDB. It's more complex, but it doesn't depend on SQLite. The WC3 doesn't see SQLite as standardized enough in browser implementation to continue using it.
Short and sweet!