-
Notifications
You must be signed in to change notification settings - Fork 52
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
[MRG] ENH: Added kwargs
options to plot_spikes_hist
#732
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## master #732 +/- ##
=======================================
Coverage 92.67% 92.67%
=======================================
Files 27 27
Lines 4928 4928
=======================================
Hits 4567 4567
Misses 361 361 ☔ View full report in Codecov by Sentry. |
Looks good @samadpls. You'll need to update the API section of |
kwargs
options to plot_spikes_hist
kwargs
options to plot_spikes_hist
It looks like you need to update your master branch and then do an interactive rebase to resolve conflicts. Have you done something like this before @samadpls? |
Sure, Yes, I've done that before. |
Cool, just don't forget to backup your local branch in case things go awry. And please reach out if you run into any issues! |
FYI @samadpls, it's best practice in this project to rebase your branch onto your updated fork of master rather than merging. Rebasing, though tricky at times, maintains a linear history of everything that was introduced in each commit and allows us to do a rebase + fast-forward merge onto master when the PR is complete. |
I recommend updating |
Can you squash your commits and rebase? |
Could you please guide me on performing a rebase and squash task? |
That seems like the right process ... you must be missing something, like you are perhaps on the wrong branch or pushing to the wrong remote. Also you have 25 commits to squash here not 7 ... I could also squash and merge for you if that makes your life easier |
Thank you for your offer. Please proceed with squash and merge for me. |
@samadpls I think the merge commits are messing you up since git-rebase handles them differently than other commits. You also have multiple nested squash commits which makes things even trickier. Since you only touch 4 files, I'd recommend backing up your changes, removing all commits from the root of this branch (using reset or interactive rebase), and replicating your work in 1 or a handful of commits. I know this is probably annoying, but it'll be faster than untangling your merge history. |
70da340
to
90f5cff
Compare
Thanks a lot for reaching out and suggesting changes, @rythorpe! It worked perfectly. I finally learned how to rebase this way. 😅 |
Looks good @samadpls! In the future you won't necessarily need to squash your commits, but it made sense here to simplify things. Glad you got the rebase figured out. As soon as you're other PR is merged (I've set it to automerge once the tests pass), you'll need to rebase onto an updated master again since there will be a conflict in |
parent 54bd278 author samadpls <[email protected]> 1710875966 +0500 committer samadpls <[email protected]> 1712241138 +0500 Added `kwargs` options to `plot_spikes_hist` Signed-off-by: samadpls <[email protected]> refactored removed extra line
Signed-off-by: samadpls <[email protected]>
I often use |
kwargs
options to plot_spikes_hist
kwargs
options to plot_spikes_hist
Thanks @samadpls ! |
…rolab#732) * Updated kwargs options for plot_spikes_hist parent 54bd278 author samadpls <[email protected]> 1710875966 +0500 committer samadpls <[email protected]> 1712241138 +0500 Added `kwargs` options to `plot_spikes_hist` Signed-off-by: samadpls <[email protected]> refactored removed extra line * fix: name typo Signed-off-by: samadpls <[email protected]> * fixed docstring --------- Signed-off-by: samadpls <[email protected]> Apply suggestions from code review Co-authored-by: George Dang <[email protected]>
…rolab#732) * Updated kwargs options for plot_spikes_hist parent 54bd278 author samadpls <[email protected]> 1710875966 +0500 committer samadpls <[email protected]> 1712241138 +0500 Added `kwargs` options to `plot_spikes_hist` Signed-off-by: samadpls <[email protected]> refactored removed extra line * fix: name typo Signed-off-by: samadpls <[email protected]> * fixed docstring --------- Signed-off-by: samadpls <[email protected]> Apply suggestions from code review Co-authored-by: George Dang <[email protected]>
Closes #186
plot_spikes_hist()
function with kwargs options