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.

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

Bugfix/non timestamp sentinel value #532

Merged

Conversation

sas1ni69
Copy link
Contributor

Fixes #531

@mathieujobin
Copy link
Collaborator

@sas1ni69 You could have done git cherry-pick 36207efd0d45

now with your current branch, you could do git rebase -i origin/core and in the editor that opens, you enter as the first line

pick 36207efd0d45

the second pick line is equivalent, you could remove it, or it should disappear automatically, if your commit is 100% 1:1

or I might just merge his PR first..

Thanks for the quick fix.

def paranoia_sentinel_value
self.class.paranoia_sentinel_value
end

def deletion_time
send(paranoia_column)
paranoia_column_value.acts_like?(:time) ? paranoia_column_value : deleted_at
Copy link
Collaborator

Choose a reason for hiding this comment

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

interesting

@sas1ni69 sas1ni69 force-pushed the bugfix/non_timestamp_sentinel_value branch from 5247637 to 6512707 Compare March 23, 2022 03:05
@sas1ni69
Copy link
Contributor Author

@mathieujobin much better! Thanks for merging his PR.

I tried to cherry pick but got bad object. I think it was because I hadn't set up upstream.

@mathieujobin mathieujobin merged commit e1dd15d into rubysherpas:core Mar 23, 2022
@mathieujobin
Copy link
Collaborator

mathieujobin commented Mar 23, 2022

@sas1ni69 I have a git command that makes this easy available in https://github.com/mathieujobin/git-scripts

I only have to do git fork-checkout sas1ni69:bugfix/non_timestamp_sentinel_value to checkout this PR locally.
the last argument being a quick copy from the top of this page.

@sas1ni69
Copy link
Contributor Author

That looks awesome! Really appreciate you sharing, gonna pick up some of your commands 👯

@mathieujobin
Copy link
Collaborator

I hope you find many useful ;)

git xrebase_all_branches might appear scary, but I use it a lot

git amendforcepush is very useful for quick typo you found after pushing something, is use it a lot part of my workflow as well

and git newbranch but its got origin/develop hardcoded as the parent for now

karunkumar1ly pushed a commit to edcast/paranoia that referenced this pull request Feb 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants