Git's "Most awesome merge" to put everything in one branch?