chore(deps): upgrade angular in examples/supply chain app

[aldousalvarez]

Fixes #2002

Signed-off-by: aldousalvarez [email protected]

[petermetz]

@aldousalvarez LGTM, thank you!

[izuru0]

LGTM

[petermetz]

@aldousalvarez Unfortunately a merge conflict came in through one of the commits that got merged to main since this was approved. Please fix the conflict and then we should be good to go again.

Don't forget to re-request review when done.

[aldousalvarez]

Hello @petermetz fixed the merge conflict that you said. And now all checks have passed. Thank you

[jagpreetsinghsasan]

LGTM

[petermetz]

Hello @petermetz fixed the merge conflict that you said. And now all checks have passed. Thank you

@aldousalvarez Great, thanks. Please rebase onto upstream/main and then run yarn to make sure that the lock file is updated. Right now if you run yarn it produces a diff on the lock file.

[aldousalvarez]

@petermetz Already done. Thank you

[aldousalvarez]

Depends on #2096

[petermetz]

@aldousalvarez Please fix the merge conflicts and then LGTM.

[petermetz]

@aldousalvarez Please put the dependency declaration to the PR description next time. The bot doesn't scan the PR comments for it.

[aldousalvarez]

@aldousalvarez Please fix the merge conflicts and then LGTM.

@petermetz Fixed the merge conflicts and now all checks have passed.

@aldousalvarez Please put the dependency declaration to the PR description next time. The bot doesn't scan the PR comments for it.

My apologies on this one. Should I put it on the commit message with the fixes and signed-off-by?

[petermetz]

@aldousalvarez It still shows that the conflicts are there =>

This branch has conflicts that must be resolved
 to resolve conflicts before continuing.
Conflicting files
yarn.lock

[petermetz]

My apologies on this one. Should I put it on the commit message with the fixes and signed-off-by?

@aldousalvarez Yes, that works best. I usually have the Fixes line and then right below it the depends on line

[aldousalvarez]

@aldousalvarez It still shows that the conflicts are there =>

This branch has conflicts that must be resolved
 to resolve conflicts before continuing.
Conflicting files
yarn.lock

my apologies on that one,

as of now all checks have passed and all conflicts have been resolved

[petermetz]

@aldousalvarez No worries, thanks for fixing it!
Other advice for the future (also not a big deal at all, just making sure you are aware) =>
when you make a change in response to a change request review (like the conflict resolution you just did) then you have to "pass the ball back" to the reviewer by re-requesting the review when you've addressed the change request.