Closed nitin-vavdiya closed 7 months ago
@borisrizov-zf Can we rerun the failed job and merge?
rebase done
@nitin-vavdiya No conflicts, so you can rebase and I'll merge after that.
@nitin-vavdiya No conflicts, so you can rebase and I'll merge after that.
Rebase done
@nitin-vavdiya Your rebase is not using upstream/main.
Follow these steps:
git config --global rerere.enable true
git fetch upstream
git checkout fix/vc-builder-credential-status-issue
git rebase upstream/main
# fix the conflict, rerere will auto-fix it for every commit after that
@nitin-vavdiya Your rebase is not using upstream/main.
Follow these steps:
git config --global rerere.enable true git fetch upstream git checkout fix/vc-builder-credential-status-issue git rebase upstream/main # fix the conflict, rerere will auto-fix it for every commit after that
done
This is not correctly done:
Give me a call if you're having trouble or have any questions.
Description
Fix for: https://github.com/eclipse-tractusx/SSI-agent-lib/issues/70
Pre-review checks
Please ensure to do as many of the following checks as possible, before asking for committer review: