|
97 | 97 | Each language is chosen for its strengths in its domain."))) |
98 | 98 |
|
99 | 99 | ;;; End of META.scm |
| 100 | +;; ============================================================================ |
| 101 | +;; CROSS-PLATFORM STATUS (Added 2025-12-17) |
| 102 | +;; ============================================================================ |
| 103 | +;; ATTENTION: Both GitHub and GitLab were active on the same day. |
| 104 | +;; Manual review required before syncing. |
| 105 | + |
| 106 | +(cross-platform-status |
| 107 | + (generated "2025-12-17") |
| 108 | + (primary-platform "github") |
| 109 | + (gitlab-mirror |
| 110 | + (path "hyperpolymath/palimpsest-license") |
| 111 | + (url "https://gitlab.com/hyperpolymath/palimpsest-license") |
| 112 | + (last-gitlab-activity "2025-12-17") |
| 113 | + (sync-status "needs-review") |
| 114 | + (notes "Both platforms active same day. 2.2MB repo - compare carefully.")) |
| 115 | + |
| 116 | + (reconciliation-instructions |
| 117 | + ";; STEP 1: Add GitLab remote and fetch" |
| 118 | + ";; git remote add gitlab https://gitlab.com/hyperpolymath/palimpsest-license.git" |
| 119 | + ";; git fetch gitlab" |
| 120 | + ";;" |
| 121 | + ";; STEP 2: Compare the two versions" |
| 122 | + ";; git log --oneline main # GitHub history" |
| 123 | + ";; git log --oneline gitlab/main # GitLab history" |
| 124 | + ";; git diff main gitlab/main # See differences" |
| 125 | + ";;" |
| 126 | + ";; STEP 3: Decide and merge if needed" |
| 127 | + ";; git merge gitlab/main --allow-unrelated-histories" |
| 128 | + ";; OR cherry-pick specific: git cherry-pick <sha>" |
| 129 | + ";;" |
| 130 | + ";; STEP 4: After reconciliation, update this section:" |
| 131 | + ";; (sync-status \"resolved\")" |
| 132 | + ";; (resolved-date \"YYYY-MM-DD\")") |
| 133 | + |
| 134 | + (action-required "needs-review")) |
| 135 | + |
0 commit comments