eclipse-tractusx / SSI-agent-lib

Apache License 2.0
4 stars 15 forks source link

fix: missing credential status in builder #90

Closed nitin-vavdiya closed 7 months ago

nitin-vavdiya commented 7 months ago

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:

nitin-vavdiya commented 7 months ago

@borisrizov-zf Can we rerun the failed job and merge?

nitin-vavdiya commented 7 months ago

rebase done

borisrizov-zf commented 7 months ago

@nitin-vavdiya No conflicts, so you can rebase and I'll merge after that.

nitin-vavdiya commented 7 months ago

@nitin-vavdiya No conflicts, so you can rebase and I'll merge after that.

Rebase done

borisrizov-zf commented 7 months ago

@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 commented 7 months ago

@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

borisrizov-zf commented 7 months ago

This is not correctly done: image

Give me a call if you're having trouble or have any questions.