-
Notifications
You must be signed in to change notification settings - Fork 330
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.
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
fix(timeline.setgroups): nested groups fold correcly when input is array #718
Conversation
looks like you have a conflict? |
Yeah, i guess in the last fortnight there's been some changes. |
I don't know about this project but typically that is not how it works. You would rebase this branch and get your PR working. Or close this PR and open another one on the latest version of the code with your fixes again. Just my two cents... |
Yeah, you're right |
Hm, the conflict looks non-trivial - I don't really understand its purpose, but it's possibly intended to address the same behaviour I am. I'll check the commit log |
@Thomaash this conflicted with your commit 36e1482 #729 I'd just like to confirm with you that my merge looks okay to you? Also @yotamberk or any maintainer, when you get the chance, can you please review this? |
3649858
to
840ca81
Compare
This reverts commit 1a8fd7e. Please squash this.
840ca81
to
afe98c5
Compare
🎉 This PR is included in version 7.4.1 🎉 The release is available on: Your semantic-release bot 📦🚀 |
I don't think you changed my intended behavior in any meaningful way. However, even though I didn't respond on time, please don't use |
Ah, crap, thanks for the comment @Thomaash - I'm not a JS dev, so I usually just replicate the patterns I see in the codebases I'm working on. |
Squash preferered, HEAD is a revert of a commit that added a demo
Fixes #113
checkout 1a8fd7e to see demonstration, head doesn't include this as the example isn't intended for production, and I want to expedite the review.