WealthLedger/backend
5
0
Fork 0
Code Issues 6 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: restore main ancestry in develop after release 2.3.1 #135

New Issue
Closed
opened 2026-10-25 10:04:06 +03:00 by codex-bot · 0 comments
codex-bot commented 2026-10-25 10:04:06 +03:00
Owner
Copy Link
Copy Source

After release PR #132 was squash-merged into main, main at 8503429 is no longer an ancestor of develop at 0dff4b4 despite identical tree contents. Existing closed PRs #133/#134 prepared a no-content reconciliation commit.

Acceptance Criteria:

  • Incorporate published main commit into develop without rewriting released history or modifying application files, using fast-forward-only PR merge of the prepared reconciliation branch.
  • Verify origin/main is an ancestor of origin/develop and both have identical content after the merge.
  • Remove obsolete reconciliation branch(es) once integration is confirmed.

Related backend#129, #132, #133, #134.

After release PR #132 was squash-merged into main, main at 8503429 is no longer an ancestor of develop at 0dff4b4 despite identical tree contents. Existing closed PRs #133/#134 prepared a no-content reconciliation commit. Acceptance Criteria: - Incorporate published main commit into develop without rewriting released history or modifying application files, using fast-forward-only PR merge of the prepared reconciliation branch. - Verify origin/main is an ancestor of origin/develop and both have identical content after the merge. - Remove obsolete reconciliation branch(es) once integration is confirmed. Related backend#129, #132, #133, #134.
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Kind/Dependencies
Dependency update or dependency-management work
 Kind/Investigation
Research or decision required before implementation
 Kind/Process
Developer workflow, CI/CD, tooling, or process improvement
 Kind/Refactor
Internal code or configuration restructuring without new product behavior
 audit/2026-10-11
Technical Audit Remediation — 2026-10-11
 kind/investigation
Нужна проверка evidence до решения; runtime-дефект не утверждается
Compat/Breaking
Breaking change that won't be backward compatible
 Kind/Bug
Something is not working
 Kind/Documentation
Documentation changes
 Kind/Enhancement
Improve existing functionality
 Kind/Feature
New functionality
 Kind/Security
This is security issue
 Kind/Testing
Issue or pull request related to testing
Priority
Critical
1
The priority is critical
Priority
High
2
The priority is high
Priority
Medium
3
The priority is medium
Priority
Low
4
The priority is low
Reviewed
Confirmed
1
Issue has been confirmed
Reviewed
Duplicate
2
This issue or pull request already exists
Reviewed
Invalid
3
Invalid issue
Reviewed
Won't Fix
3
This issue won't be fixed
Status
Blocked
1
Something is blocking this issue or pull request
Status
Need More Info
2
Feedback is required to reproduce issue or to continue work
Status
Abandoned
3
Somebody has started to work on this but abandoned work
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
codex-bot hermes-agent ksv741 publisher-bot renovate-bot
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: WealthLedger/backend#135