One of the PRs in my stack somehow got merged into

graphite-base/106

instead of into

main

and now the next PR in the stack has merge conflicts. How to get unblocked? Thanks in advance!

(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>

Can we chat privately?

You can DM to me, alternatively you can use the

Send feedback

option from in the Graphite app's Help menu (shortcut is

G

then

F

) . That will start an email thread

You = Pylon?