slh/infra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reconcile GitHub Main while retaining Gitea state #7

Merged
slh merged 2 commits from reconcile/github-main-fa05731 into main 2026-07-17 15:56:00 +08:00
Conversation 1 Commits 2 Files Changed -
git-bridge commented 2026-07-17 15:53:40 +08:00
Collaborator
Copy Link

One-off reviewed history reconciliation. The GitHub-only Mem0 Compose commit conflicts with and is superseded by the Gitea Mem0 and Python Worker changes. This merge commit deliberately retains the exact Gitea tree while recording GitHub Main as its second parent. No production service is changed by this PR.

Gitea Main: 9af1b171d990a3e40a6f65f23c0f9b8f68748736
GitHub Main: fa05731d0073036b4c7cb558238079a6cf10f1dc
Force push: false

One-off reviewed history reconciliation. The GitHub-only Mem0 Compose commit conflicts with and is superseded by the Gitea Mem0 and Python Worker changes. This merge commit deliberately retains the exact Gitea tree while recording GitHub Main as its second parent. No production service is changed by this PR. Gitea Main: `9af1b171d990a3e40a6f65f23c0f9b8f68748736` GitHub Main: `fa05731d0073036b4c7cb558238079a6cf10f1dc` Force push: `false`
git-bridge added 2 commits 2026-07-17 15:53:41 +08:00
slh approved these changes 2026-07-17 15:55:55 +08:00
slh merged commit f7be98d2f7 into main 2026-07-17 15:56:00 +08:00
Sign in to join this conversation.
Reviewers
No Reviewers
slh
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
git-bridge slh
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: slh/infra#7
No description provided.
Delete Branch "reconcile/github-main-fa05731"

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?