Skip to content

Integrate fetched tips through the merge engine and harden refs - #59

Merged
aman-a-shah merged 2 commits into
mainfrom
feat/fetched-tip-integration
Oct 25, 2026
Merged

aman-a-shah merged 2 commits into
mainfrom
feat/fetched-tip-integration

Conversation

@DanisLol

@DanisLol DanisLol commented Oct 22, 2026 •

Copy link
Copy Markdown
Member

Pull needs to integrate a downloaded commit without bypassing checkout, merge conflicts, or inactive-branch protections. Add CommitManager.integrate_fetched_tip, validate complete fetched history before integration, and publish ref files atomically. Nested branches are listed recursively; ref paths reject whitespace/control characters, symlinks, and file/directory collisions.

Closes #40.

Validation: scripts/quality-check.sh passes locally with 320 tests, including fetched fast-forwards, no-ops, clean merges, conflict resolution, inactive branches, failed ref publication, and unsafe ref paths.

@aman-a-shah aman-a-shah changed the title Integrate a fetched commit into a local branch through the existing merge engine Integrate fetched tips through the merge engine and harden refs Oct 25, 2026
@aman-a-shah
aman-a-shah merged commit 229efac into main Oct 25, 2026
1 check passed
@aman-a-shah
aman-a-shah deleted the feat/fetched-tip-integration branch October 25, 2026 23:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Week 6 - M3: Fetched-tip integration + merge/ref hardening

2 participants