Skip to content

feat: github branch status popup on cloud#9458

Draft
AdityaHegde wants to merge 4 commits into
mainfrom
feat/github-status-modals-on-cloud
Draft

feat: github branch status popup on cloud#9458
AdityaHegde wants to merge 4 commits into
mainfrom
feat/github-status-modals-on-cloud

Conversation

@AdityaHegde
Copy link
Copy Markdown
Collaborator

@AdityaHegde AdityaHegde commented May 18, 2026

Shows a popup if remote branch or primary branch diverge.

  • Add conflict resolution dialog during publish.
  • Add auto opening remote changes dialog on page load.
  • Depends on Publish merged branch in git pull response #9459 to get conflict message source. (Done)
  • Additional local commits after a pull/publish

Checklist:

  • Covered by tests
  • Ran it and it works as intended
  • Reviewed the diff before requesting a review
  • Checked for unhandled edge cases
  • Linked the issues it closes
  • Checked if the docs need to be updated. If so, create a separate Linear DOCS issue
  • Intend to cherry-pick into the release branch
  • I'm proud of this work!

@AdityaHegde AdityaHegde added the blocker A release blocker issue that should be resolved before a new release label May 18, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

blocker A release blocker issue that should be resolved before a new release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant