apply merge version edits atomically#331

tabokie wants to merge 2 commits into

tikv:6.29.tikvtikv/rocksdb:6.29.tikvfrom

tabokie:atomic-mergetabokie/rocksdb:atomic-mergeCopy head branch name to clipboard