Skip to content

Stacked branch PRs set wrong GitHub target branch (and repo?) #10936

@bmcdonnell-fb

Description

@bmcdonnell-fb

I'm very interested in what GitButler is doing - particularly the stacked branches - especially the part in the PRs where only the commits since the parent branch are shown. (Also the virtual branches are quite intriguing.) But GitButler seems to be abusing the PR target branch ("base" repo/branch), which has me thinking you haven't quite solved the problem - at least not for use with GitHub.

IMO, the goal is to merge the stacked features sequentially into (typically) the main or master branch in the upstream repo. But it looks like GitButler is setting the target to the parent branch (in the child repo).

Is this a workaround to make it only show the desired commits in the list? IMO it's problematic in terms of workflow and miscommunication.

From your demo, with my annotation

Since feature-2-gb is not logically part of feature-1-gb, it should not be merged into feature-1-gb.

Blue is as expected; red is not.

Image Image

What I expect to see

Expect to merge to main (purple).

Image

A more real world example

Both features get PRs/merged to the target branch in the upstream repo, not the originating repo.

Image Image

Additional info

Might it be preferable to invert the list order in the PR description? (i.e. List the patches/PRs in the order in which they are applied, like git rebase --interactive; not git graph order.)

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions