Link rules, an optional coc field, and fail-loud branch sync

.github/workflows/canonical-source-update.yml

@@ -94,18 +94,17 @@ jobs:
             git fetch origin $UPDATE_BRANCH
             git checkout $UPDATE_BRANCH
 
-            # Sync with main - try rebase first, then merge
+            # Sync with main - try rebase first, then merge. A merge conflict
+            # fails the job: resolving it in favour of main would silently drop
+            # the changes already on this branch.
             if ! git rebase origin/main; then
               echo "::warning title=Rebase Failed::Attempting merge instead"
               git rebase --abort 2>/dev/null || true
               if ! git merge origin/main --no-edit; then
+                CONFLICTS=$(git diff --name-only --diff-filter=U | paste -sd ' ' -)
                 git merge --abort 2>/dev/null || true
-                echo "::warning title=Merge Conflict::Auto-resolving conflicts in favor of main"
-                if ! git merge origin/main -X theirs --no-edit; then
-                  git merge --abort 2>/dev/null || true
-                  echo "::error title=Branch Sync Failed::Could not sync with main"
-                  exit 1
-                fi
+                echo "::error title=Branch Sync Conflict::${CONFLICTS:-git merge origin/main failed with no conflicted files}"
+                exit 1
               fi
             fi
           else

.github/workflows/enrich-tba-conferences.yml

@@ -81,18 +81,17 @@ jobs:
             git fetch origin $UPDATE_BRANCH
             git checkout $UPDATE_BRANCH
 
-            # Sync with main - try rebase first, then merge
+            # Sync with main - try rebase first, then merge. A merge conflict
+            # fails the job: resolving it in favour of main would silently drop
+            # the changes already on this branch.
             if ! git rebase origin/main; then
               echo "::warning title=Rebase Failed::Attempting merge instead"
               git rebase --abort 2>/dev/null || true
               if ! git merge origin/main --no-edit; then
+                CONFLICTS=$(git diff --name-only --diff-filter=U | paste -sd ' ' -)
                 git merge --abort 2>/dev/null || true
-                echo "::warning title=Merge Conflict::Auto-resolving conflicts in favor of main"
-                if ! git merge origin/main -X theirs --no-edit; then
-                  git merge --abort 2>/dev/null || true
-                  echo "::error title=Branch Sync Failed::Could not sync with main"
-                  exit 1
-                fi
+                echo "::error title=Branch Sync Conflict::${CONFLICTS:-git merge origin/main failed with no conflicted files}"
+                exit 1
               fi
             fi
           else

CONTRIBUTING.md

@@ -80,6 +80,7 @@ You can enhance your entry with these optional fields:
 -   `timezone`: IANA timezone (defaults to AoE if omitted)
 -   `sponsor`: Sponsorship page URL
 -   `finaid`: Financial aid information URL
+-   `coc`: Code of Conduct URL
 -   `twitter`: Conference Twitter handle
 -   `mastodon`: Conference Mastodon URL
 -   `note`: Additional important information

README.md

@@ -56,6 +56,7 @@ To add or update a deadline:
   end: YYYY-MM-DD # End date of conference for calendar
   sponsor: link-to-sponsor.page # URL to Sponsorship page (Optional)
   finaid: link-to-finaid.page # URL to Financial Aid page (Optional)
+  coc: link-to-coc.page # URL to Code of Conduct (Optional)
   twitter: BestConfEver # Twitter handle of conference (Optional)
   mastodon: https://mastodon.social/@bconf # Mastodon handle of conference (Optional)
   sub: PY # Type of conference (see or add _data/types.yml)
@@ -83,6 +84,7 @@ To add or update a deadline:
 | `start`             | Start date of conference for calendar                                         | `date`  | ✔        |
 | `end`               | End date of conference for calendar                                           | `date`  | ✔        |
 | `finaid`            | URL to financial aid information                                              | `str`   |          |
+| `coc`               | URL to the Code of Conduct                                                    | `str`   |          |
 | `sponsor`           | URL to sponsorship opportunities                                              | `str`   |          |
 | `twitter`           | Twitter handle of conference                                                  | `str`   |          |
 | `mastodon`          | Mastodon handle of conference                                                 | `str`   |          |