git merge again not work after revert

事源

2條branches

有同事操作失誤，merge了branch-feature-payment 去 branch-UAT

payment 開發完，但未拿到批準可以release 到UAT

於是 git revert branch-UAT

即是UNDO 了任何 merge的東西

當branch-feature-payment 拿到批文，真的想merge到 branch時

卻怎麼按都沒反應

AI 解答

Git thinks the branches are already merged. A git revert doesn't erase history; it creates a new commit that undoes the changes. To fix this, you must revert your previous revert commit. Once that's done, you can safely merge your branch again.