Skip to content

feat: use npm name cloudevents - #260

Merged
lholmquist merged 3 commits into
cloudevents:masterfrom
grant:grant_npm_cloudevents
Jul 24, 2020
Merged

feat: use npm name cloudevents#260
lholmquist merged 3 commits into
cloudevents:masterfrom
grant:grant_npm_cloudevents

Conversation

@grant

@grant grant commented Jul 23, 2020 •
edited by lance
Loading

Copy link
Copy Markdown
Member

Prepares for naming npm package cloudevents.
Fixes #215.

BREAKING CHANGE

grant and others added 3 commits July 23, 2020 11:50
@grant
feat: use npm name cloudevents
730b0e8 
fixes cloudevents#215

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>
@grant
Merge branch 'master' into grant_npm_cloudevents
7309f5e
@grant
fix: update package.json
664d0ba 
Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>
@lance

lance commented Jul 23, 2020

Copy link
Copy Markdown
Member

Looks like you have some conflicts with master. Can you fix those?

@grant

grant commented Jul 23, 2020

Copy link
Copy Markdown
Member Author

Looks like you have some conflicts with master. Can you fix those?

I can't see the conflicts. Can you comment on the conflicts in the diff?

@lance

lance commented Jul 23, 2020

Copy link
Copy Markdown
Member

I haven't looked at the diff, I'm just looking at the merge button in the PR.

This branch cannot be rebased due to conflicts
Rebasing the commits of this branch on top of the base branch cannot be performed automatically due to conflicts encountered while reapplying the individual commits from the head branch.

@grant

grant commented Jul 23, 2020

Copy link
Copy Markdown
Member Author

Can you take a picture of what you see?

This is what I see:

Screen Shot 2020-07-23 at 15 42 12

@lance

lance commented Jul 23, 2020

Copy link
Copy Markdown
Member

Strange...

image

@grant

grant commented Jul 23, 2020

Copy link
Copy Markdown
Member Author

Strange indeed.
Do you want to approve this +5 −5 diff PR?
I can merge.

Screen Shot 2020-07-23 at 16 10 28

@grant
grant requested a review from lance July 23, 2020 23:43
@grant grant self-assigned this Jul 23, 2020
lance
lance approved these changes Jul 24, 2020
View reviewed changes

@lance lance left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't land it because GH says there are conflicts. But LGTM

@lance lance added module/lib Related to the main source code module/releases Pertaining to releases of the module labels Jul 24, 2020
@lholmquist
lholmquist merged commit 565f867 into cloudevents:master Jul 24, 2020
@lance lance mentioned this pull request Jul 24, 2020
Closed
@grant
grant deleted the grant_npm_cloudevents branch July 24, 2020 23:07
@lance lance mentioned this pull request Jul 27, 2020
Closed
@lholmquist lholmquist mentioned this pull request Jul 29, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lance lance lance approved these changes
@lholmquist lholmquist lholmquist approved these changes

Assignees

@grant grant

Labels

module/lib Related to the main source code module/releases Pertaining to releases of the module

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

npm i cloudevents

3 participants

@grant @lance @lholmquist