Reconcile stable master into dev #88
No reviewers
Labels
No labels
bug
documentation
duplicate
enhancement
good first issue
help wanted
invalid
question
wontfix
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
nsaspy/starintel-server!88
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "master"
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?
Goal
Restore the repository branch policy after recent work landed on
masterwhiledevcontinued independently.devremains the integration branch.masterremains the stable branch.masterback intodevwhile retaining the 10 operational-salvage commits unique todev.Why this must land first
Open PRs #79 and #86 were retargeted to
devand currently conflict because the base branches have diverged. PR #87 was already merged intomaster; this reconciliation carries that database-repair work intodevwithout dropping the operational runtime already present there.Merge gate
After this lands, re-evaluate #79 and #86 against the synchronized
devbase.WIP: Reconcile stable master into devto Reconcile stable master into devPull request closed