Re: Made a beginners' mistake on the repository...

On Fri, Oct 28, 2022 at 4:32 AM Ivan Herman <ivan@w3.org> wrote:
> However, I simply forgot to create a new branch on my machine, and I blindly pushed it… into a bona fide merge into the main branch[1]. Something that we are not supposed to do.

Haha, woops!

> My apologies. Is there a way of turning this into a separate PR, or should we simply leave it as is, as an eternal memento of my own stupidity?

This happens to all of us. Rolling back the changes is easy because we
ensure a linear history on `main`. :)

I have rolled back your changes to `main` and made them a separate PR:

https://github.com/w3c/vc-data-model/pull/968

Unfortunately, Mahmoud just made some of the same changes that you did
in his PR:

https://github.com/w3c/vc-data-model/pull/964/files

So that will have to be reconciled between the two of you.

-- manu

-- 
Manu Sporny - https://www.linkedin.com/in/manusporny/
Founder/CEO - Digital Bazaar, Inc.
News: Digital Bazaar Announces New Case Studies (2021)
https://www.digitalbazaar.com/

Received on Friday, 28 October 2022 15:13:36 UTC