Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(stack sync): Fetch merge commits from remote before rebasing children #139

Merged
merged 1 commit into from
May 30, 2023
Merged

fix(stack sync): Fetch merge commits from remote before rebasing children #139

merged 1 commit into from
May 30, 2023

Conversation

twavv
Copy link
Contributor

@twavv twavv commented May 30, 2023 •
edited
Loading

Per title.

# Merged first branch in GH UI, then tested sync 

$ av stack sync
Synchronizing branch 2023-05-30-one...
  - fetching latest pull request information for 2023-05-30-one
  - skipping sync for merged branch (merged in commit 87232f0)

Synchronizing branch 2023-05-30-two...
  - fetching latest pull request information for 2023-05-30-two
  - rebased without conflicts
  - this branch is now a stack root based on trunk branch main
  - pushing 2023-05-30-two... okay

@aviator-app
Copy link
Contributor

aviator-app bot commented May 30, 2023 •
edited
Loading

Current Aviator status

Aviator will automatically update this comment as the status of the PR changes.
Comment /aviator refresh to force Aviator to re-examine your PR (or learn about other /aviator commands).

This PR was merged using Aviator.

See the real-time status of this PR on the Aviator webapp.

@twavv twavv requested a review from draftcode May 30, 2023 17:56
@twavv twavv changed the title fix: Fetch merge commits from remote before rebasing children fix(stack sync): Fetch merge commits from remote before rebasing children May 30, 2023
@aviator-app aviator-app bot merged commit b28f075 into master May 30, 2023
@aviator-app aviator-app bot deleted the travis/mer-2359-av-cli-fetch-merge-commits branch May 30, 2023 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@draftcode draftcode draftcode approved these changes

Assignees
No one assigned
Labels
mergequeue
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@twavv @draftcode