• 2024-09-22git error: Your local changes to the following files would be overwritten by merge
    3ad1444d^..73e10933为远程分支新提交,ac-dev分支落后远程分支4bd1444d^..83e10922个提交。现对ac-dev分支进行了修改,打算将ac-dev分支同步到4bd1444d最新提交,并保留ac-dev分支落后时的修改;ac-dev落后修改后没有提交或将其隐藏,直接cherry-pick遇到以下错误。gitcherry-p