Skip to content

Conversation

@ibetitsmike
Copy link
Contributor

@ibetitsmike ibetitsmike commented Nov 30, 2025

Fetch and fast-forward merge origin/ when creating workspaces. Failures are logged but never block workspace creation.

Generated with mux

Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

ibetitsmike added a commit that referenced this pull request Nov 30, 2025
execAsync throws on non-zero exit, so the rebase abort was never
reached when git rebase failed. Wrap in nested try-catch to ensure
we always clean up stuck rebases.

Addresses code review feedback: #800
@ibetitsmike ibetitsmike added this pull request to the merge queue Dec 1, 2025
@ibetitsmike ibetitsmike removed this pull request from the merge queue due to a manual request Dec 1, 2025
@ibetitsmike ibetitsmike force-pushed the workspace-pull-latest-checkbox branch 7 times, most recently from 315ed8d to 1943fb1 Compare December 1, 2025 15:49
Fetch and fast-forward merge origin/<trunk> when creating workspaces.
Failures are logged but never block workspace creation.

_Generated with `mux`_
@ibetitsmike ibetitsmike force-pushed the workspace-pull-latest-checkbox branch from 1943fb1 to f33b57e Compare December 1, 2025 16:11
@ibetitsmike ibetitsmike changed the title 🤖 feat: add 'Pull latest' checkbox to workspace creation 🤖 feat: fast-forward to latest origin on workspace creation Dec 1, 2025
@ibetitsmike ibetitsmike enabled auto-merge December 1, 2025 16:23
@ibetitsmike ibetitsmike added this pull request to the merge queue Dec 1, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 1, 2025
@ibetitsmike ibetitsmike added this pull request to the merge queue Dec 1, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 1, 2025
@ibetitsmike ibetitsmike added this pull request to the merge queue Dec 1, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 1, 2025
@ibetitsmike ibetitsmike enabled auto-merge December 1, 2025 17:17
@ibetitsmike ibetitsmike added this pull request to the merge queue Dec 1, 2025
github-merge-queue bot pushed a commit that referenced this pull request Dec 1, 2025
Fetch and fast-forward merge origin/<trunk> when creating workspaces.
Failures are logged but never block workspace creation.

_Generated with `mux`_
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Dec 1, 2025
@ibetitsmike ibetitsmike merged commit 7571937 into main Dec 1, 2025
28 of 31 checks passed
@ibetitsmike ibetitsmike deleted the workspace-pull-latest-checkbox branch December 1, 2025 18:08
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