@fa2cd1af UFO in git works reasonably well. Not everything is awesome, but on the whole it is > than not using git.