Having a few issues committing my code changes from my working branch back into a branch it was revert out of. My code was put into the release branch early and had to be reverted for another release, how do I then merge these changes back into the release branch as git says there are no changes being made when I merge.
I am unable to revert the revert commit or cherry pick my commits from the release branch as Gitlab doesn't allow me to do so.
与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…