Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Azf20/firehose and substreams #230

Merged
merged 3 commits into from
Nov 11, 2022
Merged

Azf20/firehose and substreams #230

merged 3 commits into from
Nov 11, 2022

Conversation

azf20
Copy link
Contributor

@azf20 azf20 commented Nov 10, 2022

  • remove "The" from Firehose

@azf20 azf20 requested a review from a team as a code owner November 10, 2022 00:04
@benface
Copy link
Contributor

benface commented Nov 10, 2022

@azf20 – Looks like you used the same branch that was merged (then auto-deleted) in #228, but we squash commits so even though you had a single commit, it was rewritten by GitHub as a different commit (with the title of the PR as its message), which means that it's now seen as a new commit and it conflicts with the current state of main. What I like to do when this happens is cherry-pick the actual new commits in another branch and force-push to the remote branch (or create another PR for that new branch). Or, you can resolve the conflict manually.

@azf20
Copy link
Contributor Author

azf20 commented Nov 10, 2022

@benface good point, I rebased

@azf20 azf20 merged commit f68dfe2 into main Nov 11, 2022
@azf20 azf20 deleted the azf20/firehose-and-substreams branch November 11, 2022 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benface benface benface approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@azf20 @benface