chor(): Handle merge conflict.

Author: jesseaborden

.github/workflows/jekyll-gh-pages.yml

@@ -0,0 +1,47 @@
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+name: Deploy Jekyll with GitHub Pages dependencies preinstalled
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["redesign/blogs"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    container: ruby:3.3
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Build site
+        run: bundle install && bundle exec jekyll build
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.ruby-version

@@ -1 +1 @@
-3.3.6
+3.3.7

404.md

@@ -1,6 +1,6 @@
 ---
 layout: new-layouts/base
-title: Internal Server Error
+title: Not Found
 permalink: /404.html
 ---
 

500.md

@@ -4,7 +4,9 @@ title: Internal Server Error
 permalink: /500.html
 ---
 
-<section class="section">
-    <h1>Internal Server Error</h1>
-    The server encountered an error and was unable to complete your request.
+<section id="exception">
+    <div class="content">
+        <h1>Internal Server Error</h1>
+        <p>The server encountered an error and was unable to complete your request.</p>
+    </div>
 </section>

CODEOWNERS

@@ -24,13 +24,13 @@
 
 # The following lines are used by GitHub to automatically recommend reviewers.
 
-* @0xTim @alexandersandberg @davelester @daveverwer @dempseyatgithub @kaishin @shahmishal @timsneath @federicobucchi
+* @swiftlang/website-workgroup
 
 CODEOWNERS @timsneath @tkremenek @shahmishal @davelester
-index.md @timsneath @tkremenek @shahmishal @davelester
+/index.md @timsneath @tkremenek @shahmishal @davelester
 /_data/new-data/landing/* @timsneath @tkremenek @shahmishal @davelester
 /_posts/* @timsneath @tkremenek @shahmishal @davelester
 
 /gsoc*/ @ktoso
 
-/openapi/ @czechboy0
+/openapi/ @czechboy0 @heckj

_data/android-workgroup/members.yml

@@ -0,0 +1,50 @@
+- name: Abe White
+  handle: aabewhite
+  github: aabewhite
+  affiliation:
+
+- name: Andrew Druk
+  handle: andriydruk
+  github: andriydruk
+  affiliation:
+
+- name: Evan Wilde
+  handle: etcwilde
+  github: etcwilde
+  affiliation:
+
+- name: Finagolfin
+  handle: finagolfin
+  github: finagolfin
+  affiliation:
+
+- name: Jason Foreman
+  handle: threeve
+  github: threeve
+  affiliation:
+
+- name: Joannis Orlandos
+  handle: Joannis_Orlandos
+  github: Joannis
+  affiliation:
+
+- name: Luke Howard
+  handle: lukeh
+  github: lhoward
+  affiliation:
+
+- name: Marc Prud’hommeaux
+  handle: marcprux
+  github: marcprux
+  affiliation:
+
+- name: Robbert Brandsma
+  handle: obbut
+  github: obbut
+  affiliation:
+
+- name: Saleem Abdulrasool
+  handle: compnerd
+  github: compnerd
+  affiliation:
+

_data/authors.yml

@@ -421,10 +421,10 @@ rcollobert:
   github: andresy
 
 simanerush:
-   name: Sima Nerush
-   email: simanerush@gmail.com
-   github: simanerush
-   about: "Sima Nerush is an incoming engineer on the Apple SwiftUI team. She is an experienced iOS Engineer, Swift Compiler contributor, and a computer science student."
+  name: Sima Nerush
+  email: sima_nerush@apple.com
+  github: simanerush
+  about: "Sima Nerush is a member of the SwiftUI team at Apple, and a Swift compiler contributor."
 
 rauhul:
   name: Rauhul Varma
@@ -533,3 +533,9 @@ umeshbatra13:
   name: Umesh Batra
   github: umeshbatra13
   about: "Umesh Batra is a member of the engineering team at Apple working on Password Monitoring and other Security Services."
+
+incertum:
+  name: Melissa Kilby
+  email: [email protected]
+  github: incertum
+  about: "Melissa Kilby works on the Swift for Linux Server team at Apple."

_data/builds/development/amazonlinux2-aarch64.yml

@@ -1,3 +1,153 @@
+- date: 2025-09-06 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-09-06-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-09-06-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-09-06-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-09-04 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-09-04-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-09-04-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-09-04-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-27 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-27-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-26 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-26-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-26-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-26-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-25 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-25-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-25-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-25-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-23 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-23-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-23-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-23-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-21 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-21-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-21-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-21-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-18 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-18-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-18-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-18-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-16 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-16-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-16-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-16-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-14 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-14-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-14-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-14-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-11 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-11-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-11-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-11-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-10 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-10-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-10-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-10-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-08 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-08-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-08-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-08-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-07 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-07-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-07-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-07-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-05 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-05-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-05-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-05-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-04 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-04-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-04-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-04-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-08-02 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-08-02-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-08-02-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-08-02-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-07-28 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-07-28-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-07-28-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-07-28-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-07-26 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-07-26-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-07-26-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-07-26-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-07-24 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-07-24-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-07-24-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-07-24-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-07-23 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-07-23-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-07-23-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-07-23-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-07-18 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-07-18-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-07-18-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-07-18-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-07-17 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-07-17-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-07-17-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-07-17-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-06-22 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-06-22-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-06-22-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-06-22-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-06-21 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-06-21-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-06-21-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-06-21-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-06-20 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-06-20-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-06-20-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-06-20-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-06-17 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-06-17-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-06-17-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-06-17-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-06-12 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-06-12-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-06-12-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-06-12-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-06-09 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-06-09-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-06-09-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-06-09-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
+- date: 2025-06-08 10:10:00-06:00
+  dir: swift-DEVELOPMENT-SNAPSHOT-2025-06-08-a
+  download: swift-DEVELOPMENT-SNAPSHOT-2025-06-08-a-amazonlinux2-aarch64.tar.gz
+  download_signature: swift-DEVELOPMENT-SNAPSHOT-2025-06-08-a-amazonlinux2-aarch64.tar.gz.sig
+  name: Swift Development Snapshot
 - date: 2025-06-03 10:10:00-06:00
   dir: swift-DEVELOPMENT-SNAPSHOT-2025-06-03-a
   download: swift-DEVELOPMENT-SNAPSHOT-2025-06-03-a-amazonlinux2-aarch64.tar.gz