sean/pipelines
Watch
1
0
Fork
You've already forked pipelines
 0
Code Issues Pull requests 12 Projects Releases 286 Packages Wiki Activity
286 releases 286 tags
  • v0.1.50 438f1d8211

    v0.1.50 Stable

    gitea_admin released this 2026-07-05 12:02:58 +00:00 | 1089 commits to main since this release

    Fixed

    • CHANGELOG lands stop conflicting: .gitattributes marks CHANGELOG.md merge=union. Two
      branches landing close together (or one landing right after a release promoted [Unreleased])
      collided on the changelog every time, even though the bullets never overlapped — each land needed
      a manual rebase just to reconcile it. The built-in union merge driver keeps BOTH sides' lines
      instead of raising a conflict (land uses Do:merge, a real 3-way merge, so the driver applies).

    Included changes (v0.1.49 -> v0.1.50)

    • ffc574651696 fix(cicd): auto-resolve CHANGELOG land conflicts via .gitattributes merge=union
    • 1430f9e83d6a fix(kernel): fetch mc static client in promote do-release (alpine/k8s lacks it)
    Downloads