MokoConsulting/MokoSuiteBackup
1
0
Fork 0
Code Issues 3 Pull Requests 1 Packages Releases 1 Wiki Activity

fix: Resolve merge conflict markers in script.php #136

Merged
jmiller merged 1 commits from fix/script-merge-conflicts into main 2026-06-23 18:32:47 +00:00
Conversation 0 Commits 1 Files Changed 1
-150
jmiller commented 2026-06-23 18:32:14 +00:00
Owner
Copy Link
Copy Source

12 conflict markers from a stale stash pop were accidentally committed to main. Resolved all conflicts keeping the version with user-facing error messages.

12 conflict markers from a stale stash pop were accidentally committed to main. Resolved all conflicts keeping the version with user-facing error messages.
jmiller added 1 commit 2026-06-23 18:32:15 +00:00
fix: resolve merge conflict markers in script.php
Joomla: Extension CI / Tests (PHP 8.2) (pull_request) Blocked by required conditions
Details
Joomla: Extension CI / Tests (PHP 8.3) (pull_request) Blocked by required conditions
Details
Joomla: Extension CI / PHPStan Analysis (pull_request) Blocked by required conditions
Details
Joomla: Extension CI / Build RC Pre-Release (pull_request) Blocked by required conditions
Details
Universal: PR Check / Build RC Package (pull_request) Blocked by required conditions
Details
Universal: PR Check / Report Issues (pull_request) Blocked by required conditions
Details
Generic: Repo Health / Scripts governance (pull_request) Blocked by required conditions
Details
Generic: Repo Health / Repository health (pull_request) Blocked by required conditions
Details
Generic: Repo Health / Report Issues (pull_request) Blocked by required conditions
Details
Universal: Pre-Release / Build Pre-Release (${{ inputs.stability || github.ref_name }}) (push) Failing after 10s
Details
Universal: Build & Release / Promote to RC (pull_request) Has been skipped
Details
Universal: Build & Release / Build & Release Pipeline (pull_request) Successful in 44s
Details
Joomla: Extension CI / Lint & Validate (pull_request) Failing after 9s
Details
Joomla: Extension CI / Release Readiness Check (pull_request) Failing after 7s
Details
Universal: PR Check / Branch Policy (pull_request) Failing after 3s
Details
Universal: PR Check / Secret Scan (pull_request) Successful in 10s
Details
Universal: PR Check / Validate PR (pull_request) Failing after 5s
Details
Joomla: Metadata Validation / Validate Joomla Metadata (pull_request) Successful in 12s
Details
Generic: Repo Health / Access control (pull_request) Successful in 1s
Details
Generic: Repo Health / Site Health (pull_request) Has been skipped
Details
Branch Cleanup / Delete merged branch (pull_request) Successful in 1s
Details
RC Revert / Rename rc/ back to dev/ (pull_request) Has been skipped
Details
Universal: Workflow Sync Trigger / Sync workflows to live repos (pull_request) Failing after 3m49s
Details
0fbcc861d9 
12 conflict markers from a stale stash pop were accidentally
committed to main in PR #135. Resolved all by keeping the
"Updated upstream" blocks which include both error_log() and
user-facing enqueueMessage() calls.
jmiller merged commit 4e6369094b into main 2026-06-23 18:32:47 +00:00
jmiller deleted branch fix/script-merge-conflicts 2026-06-23 18:32:51 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
component: admin
Admin UI and views
 component: api
REST API
 component: engine
Backup/restore engine
 component: remote
Remote storage (FTP/GDrive)
 component: scheduler
Scheduled tasks
No labels
Priority -
Type -
Milestone
No items
No Milestone
Assignees
Clear assignees
jmiller (Jonathan Miller)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: MokoConsulting/MokoSuiteBackup#136
Delete Branch "fix/script-merge-conflicts"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?