Re-base SC091, SC086

Dimitris Zacharopoulos (HARICA)

unread,

Nov 14, 2025, 6:44:28 AM11/14/25

to Gurleen Grewal, Corey Bonnell, infrast...@groups.cabforum.org

Hi Gurleen and Corey,

As we prepare for the final stages of the adoption of SC091 and SC086 can you please re-base your forked branches to the latest cabforum/servercert/main?

I noticed:

have conflicts that will need to be resolved.

As a general hint, please don't change version numbers or the tables in sections 1.2.1 and 1.2.2 when drafting a ballot because it causes conflicts :)

I am copying the infrastructure WG in case there is another way to make this work more easily.

Best,
Dimitris.

--
Dimitris Zacharopoulos
CA/B Forum SCWG Chair

Aaron Gable

unread,

Nov 14, 2025, 2:36:23 PM11/14/25

to infrast...@groups.cabforum.org, Gurleen Grewal, Corey Bonnell

I've gone ahead and resolved merge conflicts on both PRs. The conflicts were simple to resolve on both PRs:

1. At the bottom of the PR page, I clicked "Resolve conflicts"
2. Both PRs had a conflict for the document date and version header. For both, I clicked "accept incoming", so the PR would no longer be trying to edit that metadata. Updating the header can be left for when the chair merges it to main.

2. One PR had a conflict in the Revisions table. I similarly clicked "accept incoming", so the PR is no longer trying to edit that table. It can be left for the chair.

3. Both PRs had a conflict in the Relevant Dates table. For both, this was only a conflict due to a recent reformatting of that table. I clicked "accept incoming", then re-inserted the new row added by each PR.

4. I clicked "mark resolved", and pushed my merge commit to each PR's branch. I believe that anyone who is a member of the cabforum github org should have the same permission to do so.

Hopefully these steps are helpful in the future.

Aaron

--
You received this message because you are subscribed to the Google Groups "Infrastructure (CA/B Forum)" group.
To unsubscribe from this group and stop receiving emails from it, send an email to infrastructur...@groups.cabforum.org.
To view this discussion visit https://groups.google.com/a/groups.cabforum.org/d/msgid/infrastructure/23b09689-e2b3-4dde-829f-b09a2a893724%40harica.gr.

Corey Bonnell

unread,

Nov 17, 2025, 10:42:17 AM11/17/25

to Aaron Gable, infrast...@groups.cabforum.org, Gurleen Grewal

Thanks, Aaron, for fixing my PR, beat me to it!

Dimitris Zacharopoulos (HARICA)

unread,

Nov 22, 2025, 5:23:02 AM11/22/25

to infrast...@groups.cabforum.org, Gurleen Grewal, Corey Bonnell

On 11/14/2025 9:36 PM, 'Aaron Gable' via Infrastructure (CA/B Forum) wrote:

I've gone ahead and resolved merge conflicts on both PRs. The conflicts were simple to resolve on both PRs:

1. At the bottom of the PR page, I clicked "Resolve conflicts"
2. Both PRs had a conflict for the document date and version header. For both, I clicked "accept incoming", so the PR would no longer be trying to edit that metadata. Updating the header can be left for when the chair merges it to main.

2. One PR had a conflict in the Revisions table. I similarly clicked "accept incoming", so the PR is no longer trying to edit that table. It can be left for the chair.

3. Both PRs had a conflict in the Relevant Dates table. For both, this was only a conflict due to a recent reformatting of that table. I clicked "accept incoming", then re-inserted the new row added by each PR.

4. I clicked "mark resolved", and pushed my merge commit to each PR's branch. I believe that anyone who is a member of the cabforum github org should have the same permission to do so.

Hopefully these steps are helpful in the future.

Thanks Aaron, these were extremely helpful during the creation of the documents for the last IPR Review of SC90!

I'd like to kindly ask for some advise regarding https://github.com/cabforum/servercert/pull/636. I tried to sync the cleanup-2025 branch with the latest changes of the main branch. Unfortunately GitHub doesn't allow me to resolve conflicts because "main" is a protected branch. I don't get it though, I'm trying to update "cleanup-2025", not "main". Anyway, any ideas how to resolve those conflicts?

The clean-up will remove relevant dates for events that were effective years ago so some selection must be exercised during the conflict resolution.

Cheers,
Dimitris.

Aaron
On Fri, Nov 14, 2025 at 3:44 AM 'Dimitris Zacharopoulos (HARICA)' via Infrastructure (CA/B Forum) <infrast...@groups.cabforum.org> wrote:
Hi Gurleen and Corey,

As we prepare for the final stages of the adoption of SC091 and SC086 can you please re-base your forked branches to the latest cabforum/servercert/main?

I noticed:

https://github.com/cabforum/servercert/pull/626

https://github.com/cabforum/servercert/pull/573

have conflicts that will need to be resolved.

As a general hint, please don't change version numbers or the tables in sections 1.2.1 and 1.2.2 when drafting a ballot because it causes conflicts :)

I am copying the infrastructure WG in case there is another way to make this work more easily.

Best,
Dimitris.
--
Dimitris Zacharopoulos
CA/B Forum SCWG Chair
--
You received this message because you are subscribed to the Google Groups "Infrastructure (CA/B Forum)" group.
To unsubscribe from this group and stop receiving emails from it, send an email to infrastructur...@groups.cabforum.org.
To view this discussion visit https://groups.google.com/a/groups.cabforum.org/d/msgid/infrastructure/23b09689-e2b3-4dde-829f-b09a2a893724%40harica.gr.
--
You received this message because you are subscribed to the Google Groups "Infrastructure (CA/B Forum)" group.
To unsubscribe from this group and stop receiving emails from it, send an email to infrastructur...@groups.cabforum.org.

To view this discussion visit https://groups.google.com/a/groups.cabforum.org/d/msgid/infrastructure/CAEmnErdkmDn4z4ua9s%3DbrZzUzSmNV7kOjT2EOJg78suLXxm74g%40mail.gmail.com.

Dimitris Zacharopoulos (HARICA)

unread,

Dec 15, 2025, 8:31:43 AM12/15/25

to Gurleen Grewal, infrast...@groups.cabforum.org

Hi Gurleen,

Today I processed ballot SC086 first (created BRs v. 2.2.0) but I also need to process SC091 (to create version 2.2.1).

In order to sync your branch with the latest version, I created https://github.com/geegeea/servercert/pull/3 which needs to be merged in your branch.

Then I will be able to change the version number, tables, and produce version 2.2.1.

Can anyone advise me on a better process to follow?

Thank you,
Dimitris.

To view this discussion visit https://groups.google.com/a/groups.cabforum.org/d/msgid/infrastructure/923e4653-673e-4470-abf2-be742da741ca%40harica.gr.

Aaron Gable

unread,

Dec 15, 2025, 2:48:21 PM12/15/25

to infrast...@groups.cabforum.org, Gurleen Grewal

Dimitris,

The PR for Ballot SC-91 has no conflicts with `main`. You should be able to simply merge main into that PR, then update the tables, then merge the PR.

0. Close https://github.com/geegeea/servercert/pull/3, as it shouldn't be necessary

1. At the bottom of https://github.com/cabforum/servercert/pull/626, click "Update Branch"

2. Near the top right of the diff on https://github.com/geegeea/servercert/pull/3/changes, click the "..." button, then click "Edit File"

3. Make the necessary changes to the metadata, version history, and effective dates tables

4. Click "Commit changes...", enter a description in the modal dialog, and click "Commit changes"

5. At the bottom of https://github.com/geegeea/servercert/pull/3, click "Squash and merge"

Aaron

To view this discussion visit https://groups.google.com/a/groups.cabforum.org/d/msgid/infrastructure/e0bcb8b1-e8f1-412c-b31a-fc2482dd9734%40harica.gr.

Dimitris Zacharopoulos (HARICA)

unread,

Dec 16, 2025, 3:43:08 AM12/16/25

to infrast...@groups.cabforum.org, Gurleen Grewal

On 12/15/2025 9:48 PM, 'Aaron Gable' via Infrastructure (CA/B Forum) wrote:

Dimitris,

The PR for Ballot SC-91 has no conflicts with `main`. You should be able to simply merge main into that PR, then update the tables, then merge the PR.

0. Close https://github.com/geegeea/servercert/pull/3, as it shouldn't be necessary

Closed.

1. At the bottom of https://github.com/cabforum/servercert/pull/626, click "Update Branch"

Done. That's a really nice feature I didn't notice before! Thanks!

2. Near the top right of the diff on https://github.com/geegeea/servercert/pull/3/changes, click the "..." button, then click "Edit File"

This option was not allowed for me.

3. Make the necessary changes to the metadata, version history, and effective dates tables

4. Click "Commit changes...", enter a description in the modal dialog, and click "Commit changes"

5. At the bottom of https://github.com/geegeea/servercert/pull/3, click "Squash and merge"

I noticed that Gurleen's repo was successfully updated to BRs 2.2.0 and so I could edit the file in her "main" branch to make the necessary additional changes.

Thanks for the help!

Dimitris.

To view this discussion visit https://groups.google.com/a/groups.cabforum.org/d/msgid/infrastructure/CAEmnErf%2B9v3-aJOaFFUTZ8p5PrUd4JHdhpS-gO%2B2mjXz5s5vEA%40mail.gmail.com.

Aaron Gable

unread,

Dec 16, 2025, 11:50:41 AM12/16/25

to infrast...@groups.cabforum.org, Gurleen Grewal

On Tue, Dec 16, 2025, 00:43 'Dimitris Zacharopoulos (HARICA)' via Infrastructure (CA/B Forum) <infrast...@groups.cabforum.org> wrote:

2. Near the top right of the diff on https://github.com/geegeea/servercert/pull/3/changes, click the "..." button, then click "Edit File"

This option was not allowed for me

Huh, that's strange. It is allowed for me -- I dry-ran each step of this flow individually before sending the email to make sure I wasn't leading you astray. This suggests that something in the GitHub repo permissions are wrong.

Aaron

Reply all

Reply to author

Forward