Skip to content

Remove unnecessary PR updates for indirect children#23

Merged
Phlogistique merged 3 commits intomainfrom
claude/remove-indirect-pr-updates-Y3fw2
Dec 30, 2025
Merged

Remove unnecessary PR updates for indirect children#23
Phlogistique merged 3 commits intomainfrom
claude/remove-indirect-pr-updates-Y3fw2

Conversation

@Phlogistique
Copy link
Collaborator

The action now only updates direct children of a merged PR. Indirect descendants (grandchildren, etc.) are intentionally not modified.

This simplification is possible because:

  • PR diffs remain correct without updating indirect children
  • The merge-base calculation still works correctly since the synthetic merge commit includes the original parent commit as an ancestor
  • Indirect children become direct children when their parent is merged, at which point they get updated properly

Benefits:

  • Simpler code: removed ~140 lines
  • Fewer API calls and git operations
  • No risk of cascading merge conflicts through the stack
  • Clearer mental model: each merge only affects direct children

The e2e tests still verify that indirect children's diffs remain correct after their grandparent is merged.

The action now only updates direct children of a merged PR. Indirect
descendants (grandchildren, etc.) are intentionally not modified.

This simplification is possible because:
- PR diffs remain correct without updating indirect children
- The merge-base calculation still works correctly since the synthetic
  merge commit includes the original parent commit as an ancestor
- Indirect children become direct children when their parent is merged,
  at which point they get updated properly

Benefits:
- Simpler code: removed ~140 lines
- Fewer API calls and git operations
- No risk of cascading merge conflicts through the stack
- Clearer mental model: each merge only affects direct children

The e2e tests still verify that indirect children's diffs remain correct
after their grandparent is merged.
- Remove unused simulate_delete_remote_branch() helper function
- Actually verify feature3 wasn't modified instead of just logging
@Phlogistique Phlogistique merged commit 8cc3a4f into main Dec 30, 2025
3 checks passed
@github-actions github-actions bot deleted the claude/remove-indirect-pr-updates-Y3fw2 branch December 30, 2025 21:42
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.

2 participants