Skip to content

Group timeline events and show conflicting files in merge card#111

Merged
stylessh merged 3 commits intomainfrom
stylessh/misc-changes-7
Apr 14, 2026
Merged

Group timeline events and show conflicting files in merge card#111
stylessh merged 3 commits intomainfrom
stylessh/misc-changes-7

Conversation

@stylessh
Copy link
Copy Markdown
Owner

Summary

Improves the activity timeline by grouping consecutive label and review request events into single entries, and adds conflicting file path display to the PR merge status card.

Changes

  • Group consecutive label add/remove events by the same actor (within 60s) into a single timeline entry (e.g. "stylessh added bug docs and removed question labels")
  • Group consecutive review request events the same way (e.g. "stylessh requested review from user1, user2")
  • Shared grouping utility in grouped-label-event.tsx used by both issue and PR activity timelines
  • Detect conflicting files by cross-referencing PR files with base branch changes when mergeableState is dirty
  • Display conflicting file paths in a collapsible section in the merge card, matching the checks section pattern
  • Added GroupedLabelEvent, GroupedReviewRequestEvent types and conflictingFiles field to PullStatus

Test Plan

  • Open an issue/PR with multiple label changes by the same user — verify they appear as a single grouped entry
  • Open a PR with multiple review requests — verify they appear grouped
  • Open a PR with merge conflicts — verify the conflicts section shows a collapsible list of conflicting file paths
  • Open a PR without conflicts — verify "No conflicts with base branch" still renders correctly
  • Verify single label/review events still render individually (no grouping for lone events)

Screenshots

- Group consecutive label add/remove events by same actor into single timeline entries
- Group consecutive review request events the same way
- Detect and display conflicting file paths in PR merge status card
- Conflicts section uses collapsible pattern matching checks section
@cloudflare-workers-and-pages
Copy link
Copy Markdown

cloudflare-workers-and-pages bot commented Apr 14, 2026

Deploying with  Cloudflare Workers  Cloudflare Workers

The latest updates on your project. Learn more about integrating Git with Workers.

Status Name Latest Commit Updated (UTC)
✅ Deployment successful!
View logs
diffkit 69f371c Apr 14 2026, 01:07 AM

…ry pruning

- Run CI checks on fork PRs via pull_request_target with explicit activity types
- Show username:branch for fork PR head refs in detail header
- Add repo tab matching to prevent tree queries from being pruned mid-flight
@stylessh stylessh merged commit a8ebe3c into main Apr 14, 2026
4 checks passed
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.

1 participant