search

w3c-ccg / did-wg-charter

An EXPERIMENTAL charter for the W3C Decentralized Identifier Working Group
https://w3c-ccg.github.io/did-wg-charter/
Other
10 stars 4 forks source link

Update index.html #48

Closed TallTed closed 5 years ago

TallTed commented 5 years ago
msporny commented 5 years ago

Duplicate of #31 and #40?

TallTed commented 5 years ago

As with #40. See a problem, fix a problem, not remembering that a fix is pending from weeks ago...

msporny commented 5 years ago

As with #40. See a problem, fix a problem, not remembering that a fix is pending from weeks ago...

What do you want me to do here? Merge all three, merge two of three, merge one of them and close the other two?

In the future, the best way to address this is to do the clean up in one PR as that reduces the number of conflicts and makes it easier for me to make an "it's editorial, merging" decision.

TallTed commented 5 years ago

the best way to address this is to do the clean up in one PR

Well, yes, which I would have done had I remembered that (or thought to check whether) the earlier existed when I did the later...

What do you want me to do here? Merge all three, merge two of three, merge one of them and close the other two?

I think it'll be best to merge #31 (where I've now resolved the conflicts), let me resolve conflicts on #40, merge #40, let me resolve conflicts on #48, and merge #48. I'll do my best to check for unmerged PRs before creating new ones going forward.

msporny commented 5 years ago

I think it'll be best to merge #31 (where I've now resolved the conflicts), let me resolve conflicts on #40, merge #40, let me resolve conflicts on #48, and merge #48. I'll do my best to check for unmerged PRs before creating new ones going forward.

Great, thanks, I'll focus on #31 for now, then.

msporny commented 5 years ago

Ok, #30 is merged. Please fix merge conflicts for #40.

msporny commented 5 years ago

Ok, #40 is merged. Please fix merge conflicts for #48 (this PR).

TallTed commented 5 years ago

@msporny - I think this'll do it.

msporny commented 5 years ago

Great, thanks @TallTed! Going to go and tell everyone else to rebase their PRs now.