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

Merging doc-onboarding according to yesterday's decision at CANDy DevOPS COP #66

Open
wants to merge 4 commits into
base: main
Choose a base branch
from

Conversation

pruneau628
Copy link

No description provided.

Copy link
Contributor

@WadeBarnes WadeBarnes left a comment

Choose a reason for hiding this comment

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

DCO seems to be missing from at least one commit in this PR.

@pruneau628
Copy link
Author

Looking into it @WadeBarnes

@pruneau628
Copy link
Author

@SylvainMartel the DCO problem in this merge request is happening because I did a rebase of the doc-onboarding branch from the main branch. I did it in the github web gui, and the rebase/merge commit is not signed-off by me, possibly because I forgot to check some box somewhere.
I can sign-off the merge commit on my local clone w/o problem, but since it modifies the commit, I have to force-push it on the doc-onboarding branch.
It's impossible because the doc-onboarding branch is protected:

~/dev/github.com/ICCS-ISAC/Candy
bruno@bruno-thinkpad:# git push --force
Enumerating objects: 7, done.
Counting objects: 100% (7/7), done.
Delta compression using up to 16 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 407 bytes | 407.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
remote: error: GH006: Protected branch update failed for refs/heads/doc-onboarding.
remote: error: Cannot force-push to this branch
To github.com:ICCS-ISAC/Candy.git
 ! [remote rejected] doc-onboarding -> doc-onboarding (protected branch hook declined)
error: failed to push some refs to 'github.com:ICCS-ISAC/Candy.git'

Would you please unlock the branch, and notify me, I will re-do the push.
I'll re-notify you when the push is done, and we will re-protect the branch, in the case if someone needs it still.
We sould be able to merge this PR afterward.

@pruneau628 pruneau628 force-pushed the doc-onboarding branch 2 times, most recently from 4496458 to 9c3bdb6 Compare May 24, 2023 19:21
SylvainMartel and others added 4 commits May 24, 2023 15:22
Signed-off-by: Bruno Hivert <bruno.hivert@idlab.org>
Signed-off-by: Sylvain Martel <sylvain.martel10@mcn.gouv.qc.ca>
Signed-off-by: Bruno Hivert <bruno.hivert@idlab.org>
Maintenance schedule for CANDy registry nodes

Signed-off-by: Shakira Kaleel <91096628+ShakiraKaleel@users.noreply.github.com>
Signed-off-by: Bruno Hivert <bruno.hivert@idlab.org>
Signed-off-by: Shakira Kaleel <91096628+ShakiraKaleel@users.noreply.github.com>
Signed-off-by: Bruno Hivert <bruno.hivert@idlab.org>
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.

4 participants