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

fix(block-api): merging ability for two blocks without the merge method #1422

Merged
merged 3 commits into from
Nov 10, 2020
Merged

fix(block-api): merging ability for two blocks without the merge method #1422

merged 3 commits into from
Nov 10, 2020

Conversation

robonetphy
Copy link
Member

resolve #1415

@robonetphy robonetphy requested a review from neSpecc November 10, 2020 08:55
neSpecc
neSpecc requested changes Nov 10, 2020
View reviewed changes
Copy link
Member

@neSpecc neSpecc left a comment

Choose a reason for hiding this comment

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

The fix is ok. Make a production bundle pls

@robonetphy robonetphy requested a review from neSpecc November 10, 2020 09:25
@robonetphy robonetphy marked this pull request as ready for review November 10, 2020 15:33
@neSpecc
Copy link
Member

neSpecc commented Nov 10, 2020

@robonetphy squash pls

@neSpecc neSpecc changed the title static getter added to mergeble method fix: merging ability for two similar blocks Nov 10, 2020
@neSpecc neSpecc changed the title fix: merging ability for two similar blocks fix: merging ability for two unsimilar blocks Nov 10, 2020
@neSpecc neSpecc changed the title fix: merging ability for two unsimilar blocks fix: merging ability for two blocks without the merge method Nov 10, 2020
@neSpecc neSpecc changed the title fix: merging ability for two blocks without the merge method fix(block-api): merging ability for two blocks without the merge method Nov 10, 2020
@robonetphy robonetphy merged commit b134fcc into next Nov 10, 2020
@neSpecc neSpecc deleted the resolve_merge_method_bug_1415 branch November 10, 2020 18:04
@neSpecc neSpecc mentioned this pull request Nov 20, 2020
Closed
neSpecc pushed a commit that referenced this pull request Dec 8, 2020
@robonetphy @neSpecc
static getter added to mergeble method (#1422)
3c5c265 
* static getter added to mergable method

* build production bundle

* Changelog added
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ranemihir ranemihir ranemihir approved these changes

@neSpecc neSpecc neSpecc approved these changes

@gohabereg gohabereg Awaiting requested review from gohabereg gohabereg is a code owner

@khaydarov khaydarov Awaiting requested review from khaydarov

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

Successfully merging this pull request may close these issues.

[Bug] Trying to merge two blocks that don't have a merge method
3 participants
@robonetphy @neSpecc @ranemihir