Skip to content

Record upstream ancestry for 8 cherry-picked commits#36

Merged
aaditagrawal merged 9 commits intomainfrom
upstream-ancestry-merge
Mar 26, 2026
Merged

Record upstream ancestry for 8 cherry-picked commits#36
aaditagrawal merged 9 commits intomainfrom
upstream-ancestry-merge

Conversation

@aaditagrawal
Copy link
Copy Markdown
Owner

@aaditagrawal aaditagrawal commented Mar 26, 2026

Summary

  • Ancestry-only merge (git merge -s ours) against upstream 37cf0c11
  • No file changes — this only records the git relationship
  • After merging, git log main..upstream/main drops from 9 to 1 commit (only 9403429a remains ahead)

This establishes proper ancestry so future upstream syncs have a correct merge base, avoiding redundant conflict resolution for the 8 commits already integrated in PR #35.

Test plan

  • Verify zero diff: git diff main..upstream-ancestry-merge produces no output
  • After merge, git log main..upstream/main shows only 9403429a

juliusmarminge and others added 9 commits March 25, 2026 09:45
@juliusmarminge @codex
fix(security): send sensitive config over a bootstrap fd (pingdotgg#1398
b3bca04 
)

Co-authored-by: codex <codex@users.noreply.github.com>
@jakob1379
docs: properly linked CLAUDE.md to AGENTS.md (pingdotgg#1328)
df5bde7 
Co-authored-by: Jakob Guldberg Aaes <jakob1379@gmali.com>
@ifBars
fix(web): prevent provider model submenu overlap (pingdotgg#1403)
3289a25
@keyzou @claude @juliusmarminge
feat(git): Add Claude as a TextGenerationProvider (pingdotgg#1323)
ff8d87d 
Co-authored-by: keyzou <keyzou@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge @cursoragent @cursor
Add copy action to error toast messages (pingdotgg#1416)
8888f6a 
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: cursor[bot] <206951365+cursor[bot]@users.noreply.github.com>
@78i87
fix(desktop): prevent git actions and terminal toggle from overlapping (
2aa11ae 
pingdotgg#1423)

Co-authored-by: morgan ye <morganye@morgans-MacBook-Pro.local>
@AbdulelahHajjar
fix(web): clear composer border after picker dismissal (pingdotgg#1382)
bf1f3e1
@BeckWangthumboon
fix(web): add pointer cursor to composer send button (pingdotgg#1415)
37cf0c1
@aaditagrawal
Ancestry merge: record upstream/main integration up to 37cf0c1
2345386 
Establishes git ancestry with upstream commits b3bca04..37cf0c1
(8 commits) that were cherry-picked and conflict-resolved in PR #35.
No file changes — this merge only records the relationship so future
upstream syncs start from the correct base.
@github-actions github-actions bot added size:XS 0-9 effective changed lines (test files excluded in mixed PRs). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Mar 26, 2026
@aaditagrawal aaditagrawal merged commit 2a6235c into main Mar 26, 2026
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

size:XS 0-9 effective changed lines (test files excluded in mixed PRs). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@aaditagrawal @juliusmarminge @jakob1379 @ifBars @keyzou @78i87 @AbdulelahHajjar @BeckWangthumboon