Re-base SC091, SC086

[Dimitris Zacharopoulos (HARICA)]

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

[Aaron Gable]

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]

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

[Dimitris Zacharopoulos (HARICA)]

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.