feat: abort merge when there's going to be data lost during a merge - #1081

feat: abort merge when there's going to be data lost during a merge#1081

doc-han wants to merge 11 commits into

mainOpenFn/kit:mainfrom

cli-merge-with-abortOpenFn/kit:cli-merge-with-abortCopy head branch name to clipboard