-
Notifications
You must be signed in to change notification settings - Fork 305
Improve explanations of usernames #864
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The explanation is clear.
There's just something wrong with the commit sequence; needs rebase.
|
Right. It is just that stuff seems to happen every time I rebase, and I end up having to do a merge anyway... |
|
@kjetilk Ping me if I can help. |
|
Yup, I will @RubenVerborgh , just need to investigate a bit more myself, to see if I understand the pain point. BTW, the Snyk failure, is there something we could cherry-pick for that? |
|
@kjetilk Just a rebase on develop will do. The following should work: Then pick only the commits you need. |
|
OK, so perhaps this is what happened: I merged the 5.0.0 branch into it...? If so, that was certainly an accident. I probably meant to merge develop into the 5.0.0 at that point. Anyway, let me see if I can rebase it successfully with that understanding. |
a81b178 to
36a09fd
Compare
|
OK, so how about now? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Maybe squash merge?
|
OK, I usually look at commits as the gory details, but let me do that to experience the difference :-) |
This should implement #823 and also address (at least partially) the bug in solid/solid#205 by downcasing usernames on submition.