git is stupid, trashes shource with merge, no easy undo