Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: add squash command #492

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
Merged
aviator-app merged 7 commits into from
Jul 18, 2025
Merged

feat: add squash command #492

aviator-app merged 7 commits into from
Jul 18, 2025

Conversation

@Brookke
Copy link
Contributor

@Brookke Brookke commented Dec 13, 2024 •
edited
Loading

This adds a squash command that squashes the commits of the current branch into a single commit

@aviator-app
Copy link
Contributor

aviator-app bot commented Dec 13, 2024 •
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.
Use the Aviator Chrome Extension to see the status of your PR within GitHub.

Brookke
Brookke commented Dec 13, 2024
View reviewed changes
Brookke
Brookke commented Dec 13, 2024
View reviewed changes
Brookke
Brookke commented Dec 13, 2024
View reviewed changes
@Brookke
Copy link
Contributor Author

Brookke commented May 17, 2025

Hey @draftcode @jainankit, Just realised I never got this merged, are you able to help with the above questions? Then I will address then ready for merge

tulioz
tulioz reviewed Jun 26, 2025
View reviewed changes
Copy link
Contributor

@tulioz tulioz left a comment

Choose a reason for hiding this comment

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

Sorry for the delay in response, let me know if you have other questions, would love to see this get merged

@Brookke Brookke changed the title wip: add squash command feat: add squash command Jun 28, 2025
@Brookke Brookke marked this pull request as ready for review June 28, 2025 12:33
@Brookke Brookke requested a review from a team as a code owner June 28, 2025 12:33
@aviator-app
Copy link
Contributor

aviator-app bot commented Jun 28, 2025 •
edited
Loading

✅ FlexReview Status

Common Owner: aviator-co/engineering (expert-load-balance assignment)
Owner and Assignment:

  • ✅ aviator-co/engineering (expert-load-balance assignment)
    Owned Files
    • cmd/av/main.go
    • cmd/av/squash.go

Review SLO: 7 business hours if PR size is <= 200 LOC for the first response.

@tulioz
Copy link
Contributor

tulioz commented Jun 30, 2025

Screen.Recording.2025-06-30.at.14.58.35.mov

When running locally the squash happens correctly, but process also hangs

@Brookke Brookke force-pushed the feat/add-squash branch 2 times, most recently from 58de82b to 2f7959a Compare July 18, 2025 22:17
@Brookke
Copy link
Contributor Author

Brookke commented Jul 18, 2025 •
edited
Loading

Screen.Recording.2025-06-30.at.14.58.35.mov
When running locally the squash happens correctly, but process also hangs

Sorry for the delay, I changed jobs recently so have been a little busy. This should no longer hang @tulioz

@Brookke Brookke requested a review from tulioz July 18, 2025 22:20
tulioz
tulioz approved these changes Jul 18, 2025
View reviewed changes
Copy link
Contributor

@tulioz tulioz left a comment

Choose a reason for hiding this comment

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

lgtm! sorry for not including --debug output, screen recording was probably not the most useful. Congrats on the new role!

@aviator-app aviator-app bot merged commit 9089c92 into aviator-co:master Jul 18, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tulioz tulioz tulioz approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Brookke @tulioz