An ATproto social media client -- with an independent Appview.
refactor(actions): here we go again
+1
-16
+1
-16
.github/workflows/nightly-upstream-merge.yml
+1
-16
.github/workflows/nightly-upstream-merge.yml
···
55
55
# Create a new branch for the sync
56
56
BRANCH_NAME="upstream-sync-$(date +%Y-%m-%d-%H%M%S)"
57
57
echo "branch_name=$BRANCH_NAME" >> $GITHUB_ENV
58
-
git checkout -b $BRANCH_NAME
59
-
60
-
if git merge upstream/main --no-edit --allow-unrelated-histories; then
61
-
echo "✅ Clean merge successful"
62
-
else
63
-
echo "⚠️ Merge conflicts detected - committing conflicted state"
64
-
# Add all files (including conflicted ones) and commit
65
-
git add .
66
-
git commit -m "ci: merge upstream/main with conflicts
67
-
68
-
This merge contains conflicts that need manual resolution.
69
-
Conflicted files contain conflict markers (<<<<<<<, =======, >>>>>>>).
70
-
71
-
Auto-generated by upstream sync workflow."
72
-
fi
73
-
58
+
git checkout -b $BRANCH_NAME
74
59
git push origin $BRANCH_NAME
75
60
76
61
- name: Create PR