Use annotated tags, avoid orphaned branch problems