# Fetch latest from upstream
git fetch upstream --tags

# Switch to main and sync
git checkout main
git merge --ff-only upstream/main

# Push to your fork
git push origin main

# Pull all upstream tags
git fetch upstream --tags

# Push all tags to your fork
git push origin --tags

# For each new upstream release
git checkout -b release/15.4.1 upstream/release/15.4.1
git push origin release/15.4.1

# Create from your current boilerplate
git checkout -b boilerplate/15.5.0 boilerplate/15.4.1

# See what changed between versions
git diff --name-status v15.4.1..v15.5.0

# View commit log
git log --oneline v15.4.1..v15.5.0

# For modified files in assets/
git show v15.5.0:assets/cart.js > src/theme/assets/cart.js
git show v15.5.0:assets/global.js > src/theme/assets/global.js

# For modified files in sections/
git show v15.5.0:sections/main-product.liquid > src/theme/sections/main-product.liquid

# For modified files in snippets/
git show v15.5.0:snippets/price.liquid > src/theme/snippets/price.liquid

# For new files
git show v15.5.0:snippets/unit-price.liquid > src/theme/snippets/unit-price.liquid

# Update all locale files
for locale in bg cs da de el en es fi fr hr hu id it ja ko lt nb nl pl pt-BR pt-PT ro ru sk sl sv th tr vi zh-CN zh-TW; do
  git show v15.5.0:locales/${locale}.json > src/theme/locales/${locale}.json 2>/dev/null || true
  git show v15.5.0:locales/${locale}.schema.json > src/theme/locales/${locale}.schema.json 2>/dev/null || true
done

# Update config
git show v15.5.0:config/settings_schema.json > src/theme/config/settings_schema.json

# Check for new workflow files
git diff --name-only v15.4.1..v15.5.0 .github/

# Review and selectively apply changes
# Note: Keep our custom workflows, only update if necessary

git add -A
git commit -m "Upgrade boilerplate to v15.5.0

Applied upstream changes from v15.4.1 to v15.5.0:
- Fixed cart performance measurement
- Updated nested cart lines support
- Improved unit price display
- Updated translations across all locales
- [Add other key changes]

Changes applied to src/theme/ structure."

git push origin boilerplate/15.5.0

git checkout develop
git merge boilerplate/15.5.0
# Resolve any conflicts if needed
git push origin develop

# Create feature branch from develop
git checkout develop
git pull origin develop
git checkout -b feature/test-something

# Make changes
echo "Test change" >> README.md
git add README.md
git commit -m "Test: workflow validation"

# Push to GitHub
git push -u origin feature/test-something

# Option A: Using GitHub CLI
gh pr create --base develop --title "Test workflow" --body "Testing preview deployment"

# Option B: Via GitHub Web UI
# Go to: https://github.com/benjaminv/dawn/compare/develop...feature/test-something

# Check workflow runs
gh run list --branch feature/test-something

# Watch specific run
gh run watch

# View logs
gh run view --log

# 1. Sync develop branch
git checkout develop
git pull origin develop

# 2. Create feature branch
git checkout -b feature/my-feature

# 3. Make changes and commit
# ... do your work ...
git add .
git commit -m "feat: add new feature"

# 4. Push and create PR
git push -u origin feature/my-feature
gh pr create --base develop

# After review, merge PR
gh pr merge --squash

# Automatic actions:
# - Preview theme deleted
# - Code deployed to live theme
# - Tagged themes updated