Nubenetes Bot c70aef8b78 fix: readme-sync push loop — switch from rebase to merge-based retry ...

The rebase loop never attempted a push after self-healing; it looped
back to `git pull --rebase` and hit a fresh conflict every iteration
(5x), then the final bare push failed non-fast-forward.

Root cause: in a rebase `--ours` = remote side (not our bot commit),
so the README was discarded and rebuilt each round while the remote
kept advancing.

Fix:
- Pull latest *before* committing (shrinks conflict window)
- Retry loop now tries push first, then merge-pulls on rejection
- Uses `-X ours` merge (correct semantics: keep bot's README)
- Re-runs updater after each merge so metrics stay consistent

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

2026-06-19 16:02:13 +02:00

..

workflows

fix: readme-sync push loop — switch from rebase to merge-based retry

2026-06-19 16:02:13 +02:00

dependabot.yml

feat: implement Platinum Maintenance suite (Dependabot, Social Cards, Automated Triage) [skip ci]

2026-05-19 10:47:41 +02:00

PULL_REQUEST_TEMPLATE.md

chore: modernize CI/CD, UI aesthetics, and documentation

2026-05-20 10:03:32 +02:00