-
-
Notifications
You must be signed in to change notification settings - Fork 4k
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
Allow SSO authentication to provide a user secret #27909
Conversation
This comment has been minimized.
This comment has been minimized.
Would be great if you could squash the commits to clean the history. But let's see what CI says, probably more to add. |
Forgive my ignorance, but I have no idea how to do that. I did some searching, tried a few tutorials, and wasn't successful. It seems like everyone uses git a bit differently . . . If you could tell me what commands to run, I'll gladly do it. I'm a technical user, but I'm not the most git-savvy. |
This should do it, basically removing the last three commits from the log and creating a new commit with the apparent changes: git reset --soft HEAD~3
git commit
git push -f origin HEAD CI is happy 😃, just for the record, in case after squash some drone check fails for an obviously unrelated reason. |
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.
Something seems to have gone wrong with the rebase.
A rebase onto the latest upstream branch was missing but changes from that present. Dammit, I resolved it locally and wanted to push them |
@summersab git add . # add newly done local changes
git commit --amend --no-edit # amend to existing commit (skip --no-edit if you want to change commit text)
git remote add upstream https://github.com/nextcloud/server.git # if not yet done
git fetch upstream
git rebase upstream/master # rebase the commit onto latest upstream master branch, in case it got changes in the meantime
git push -f origin HEAD And when squashing commits like posted above, always good to assure that the intended commits are included: git log |
Implementing PR #24837 from immerda. It's a feature I'd like to have, and he hasn't been active on GitHub since December. So, I'd like to submit the PR.