It seems that all of those features are Git-features. The missing piece is a "git-aware" markdown editor, as in, an editor that knows about git branches, and can commit/push and be mildy helpful if there's a conflict.