Topic: Potential PR Merge Bug Please review this <...
# report-bugs
s
Topic: Potential PR Merge Bug Please review this Loom. Please note that the reviewer can merge the branch in GitHub.
p
(If applicable) To help us repro, please send the following if you haven't already: - PR links, screenshots, and/or debug output if applicable - Repro steps - Does this happen consistently? Just to you or others on your team also? - Is this a regression? Is the problem new? - If you're having an issue with the CLI, please send us debug logs using
gt feedback --with-debug-context <any message>
hey Sven, thanks for that Loom recording. Will look into that
🙏 1
hey Sven, I'm seeing that particular PR was able to be merged. Just confirming that worked from in Graphite UI?
s
Hey Gary. I am still not entirely sure what exactly is happening, but here’s the summary: In GitHub, we have explicitly enabled merge commits, squash merging, and rebase merging. However, when I tried to do a regular merge for the PR, I received a 500 error from Graphite with the message (in the console) “merge commits are not allowed in this repository”. I then checked GitHub, and it too permits squash or rebase merging for the PR only. The only issue in Graphite is that the UI allows me to attempt a type of merge — in our case, a regular merge commit — that GitHub does not allow.