wmedvede commented on PR #4021:
URL:
https://github.com/apache/incubator-kie-kogito-runtimes/pull/4021#issuecomment-3401371579
weird, I have rebased this branch with main locally and got this error:
git rebase upstream/main
Auto-merging quarkus/addons/pom.xml
CONFLICT (content): Merge conflict in quarkus/addons/pom.xml
error: could not apply 85adaa02ae... Introducing jwt parser handler and
associated classes
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git
rebase --abort".
Could not apply 85adaa02ae... Introducing jwt parser handler and associated
classes
However, the github check says "No conflicts with base branch"
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
