.png%3Falt%3Dmedia%26token%3D0abeb39f-a80f-4705-90e6-247dd98e5ab9)
.png%3Falt%3Dmedia%26token%3D0abeb39f-a80f-4705-90e6-247dd98e5ab9)
FAQs and Troubleshooting
If you have a question or issue that's not answered below, feel free to reach out to us at [email protected].
This usually indicates that MergeQueue is configured to require a particular status check before merging a PR, but your pull request hasn't executed that check because your repository is configured to only run checks for pull requests that target your repository default branch (e.g.,
main or master). This happens because PRs in a stack (other than the first) do not explicitly target the default branch.If using GitHub actions, make sure your workflow configuration (
.github/workflows/<name>.yml) is set to run the check on all branches.# Sample configuration, adapt accordingly
on:
pull_request:
branches:
- "*"
Yes. Aviator will refuse to merge a stack that has a failing PR within it.
One common strategy to make incremental changes easier is the use of feature flags. This allows your work to be incorporated into your codebase even before it’s ready for public consumption, reducing the chance for merge conflicts and keeping your feature branches up to date. For example, your first PR might look something like this:
# Only set to True during development
ENABLE_AUTOMATIC_CAT_GIFS = False
def greet_user(user):
...
if ENABLE_AUTOMATIC_CAT_GIFS:
send_sms(user.phone_number, "<gif of an adorable cat>")
Using the GitHub merge button merges the PR where the button is clicked into its base branch. In the case of stacked PRs, this means you might be merging PR #2 into PR #1, which is generally not what's desired.
Feature branches involve dedicating a branch for a given feature. Instead of making PRs to the base branch of the repository, PRs are made into the feature branch. When the feature is complete, the feature branch can then be merged into the base branch.
While this works great for some teams and projects, feature branches (especially those that are relatively long lived) run the risk of drifting out of sync with the main branch. When it comes time to merge the feature branch into the main branch, there’s a much greater chance for conflicts — either explicit merge conflicts or more subtle semantic conflicts (e.g., unexpected interactions between two components). Many teams and organizations now use a method known as trunk based development which helps solve some of these issues.
Stacked PRs enables engineers to be more productive, especially when using trunk based development. While it’s possible for stacks to drift out of date with the main branch, this is less of an issue since stacks are usually smaller in size and shorter lived than feature branches, and Aviator helps you keep your stacks up to date with the main branch.
Last modified 10mo ago