I created a feature branch myfeature off the release branch (repository) release2021.
My pull request passed code review but got this error:
“This pull request has changes conflicting with the target branch.
implementation/src/util/Constants.java”
How to fix this error?
Gitea which I use does not have any button to resolve conflict.