Learn about Centmin Mod LEMP Stack today
Register Now

Beta Branch stop cmupdate on unresolved git conflicts in 140.00beta01

Discussion in 'Centmin Mod Github Commits' started by eva2000, Nov 20, 2026 at 8:54 AM.

  1. eva2000

    eva2000 Administrator Staff Member

    60,551
    12,627
    113
    May 24, 2014
    Brisbane, Australia
    Ratings:
    +19,292
    Local Time:
    12:44 AM
    Nginx 1.31.x
    MariaDB 10.x/11.4+/12.3+
    stop cmupdate on unresolved git conflicts in 140.00beta01

    When cmupdate's stash pop conflicted, tracked files such as centmin.sh were
    left with conflict markers, so centmin.sh no longer ran. Later cmupdate
    runs could not stash or fast-forward but still printed "Updated Centmin Mod
    code".

    Changes:
    - inc/git_sync.inc: stop with the unmerged files listed and the
    git checkout HEAD -- <file> step when the checkout has unresolved
    conflicts
    - inc/git_sync.inc: a failed stash pop lists the conflicted files and
    returns an error
    - tools/cmupdate.sh: print a failure banner and exit 2 when the git sync
    fails

    Continue reading...

    140.00beta01 branch