title: How to merge my working branch to main branch as main branch revert?
body: <p>If I checkout a branch <code>a</code> from main branch, and I have made many changes on <code>a</code> branch. But the main branch revert some commits for some reasons. How can I merge <code>a</code> branch's changes to main branch the right way?</p>