specifications icon indicating copy to clipboard operation
specifications copied to clipboard
verified publisher icon notaryproject

`cose-envelope` branch: fix conflict with `main` branch caused by squash merge

Open letmaik opened this issue 3 years ago • 1 comments

This is an empty merge commit to make the cose-envelope branch mergable with main again. There are no content changes. This fixes the accidental squash merge that happened in https://github.com/notaryproject/notaryproject/pull/177#issuecomment-1202655355.

As usual: Do not squash merge or rebase this PR.

letmaik avatar Aug 03 '22 11:08 letmaik

Huh, DCO is complaining again. Looking at it more closely, this is because existing commits in main have DCO issues. Apart from re-writing main, I think the only sane solution is to ignore the error.

letmaik avatar Aug 03 '22 11:08 letmaik

@letmaik I fixed the merge conflicts. Let's use that PR to drive forward. https://github.com/notaryproject/notaryproject/pull/148

dtzar avatar Sep 08 '22 21:09 dtzar