Unable to Merge Pull Requests Directly into Main

[yaschet]

Version

0.14.6 (20250121.112215)

Operating System

macOS

Distribution Method

dmg (Mac OS - Apple Silicon)

Describe the issue

Hi, I’m unable to merge pull requests into the production branch (main) directly.

The only way it works is through GitHub’s Pull Request page, but even then, I get a warning afterward.

I have already removed the project from GitButler, renamed the production branch from master to main, and then retried again, same thing.

This issue doesn’t seem to affect my other repositories.

GitButler_Demo.mp4

How to reproduce (Optional)

No response

Expected behavior (Optional)

No response

Relevant log output (Optional)

[Byron]

Thanks a lot for reporting!

@krlvi suspects that this is related how stacks are represented in the user-interface, which apparently can lead to confusing situations like these. Maybe that would explain that the issue is only present in this particular repository.

If it's open-source code and within GitHub size limits, it could be zipped up and shared here so we can take a closer look.

[yaschet]

@Byron The repository isn't open-source, but I’m happy to provide details.

I checked .git/refs/remotes/origin and noticed directories like feature, style, and fix, with the actual branch names inside them.

I don’t create branches like fix, only fix/name-of-branch.

Let me know what would be most helpful.

[Byron]

Oh, that's interesting! Maybe it's related to branch names with slashes inside of them?

Since the issue only occours within this repository, maybe that's the difference to the other repositories where it works.

[yaschet]

@Byron, But I use slashes in other repositories as well.

Never had an issue, pull requests and merges work just fine there.

[SnaveSutit]

I'm encountering the same issue in latest (0.14.7), I've tried using slash-less names, only having a single virtual branch in my stack, and clearing out all pending changes / PRs. No success 😭

We can probably close #5726 as a duplicate of this one. I left a comment there a couple days ago indicating the issue has re-emerged.