This message was deleted.

I just merged another stack, and it happened again 😞 Am I doing something wrong? Just to make sure if everything is in shape, I ran

gt stack restack

, and it said it's okay. But as soon as I started merging the first PR, it failed with conflicts. I need some help here to prevent this.

Hi there! Sorry about the late response here. @Jacob Gold can help take a look!

Literally it's happening every time I merge the stack on Graphite 😞 (The CLI is always up to date)

hmm, can you share some example prs that failed to merge? i'm interested in understanding what kinds of conflicts github is reporting, as we should only be failing with conflicts when there are real new conflicts with the updated version of your trunk branch

@Jacob Gold This is the first PR of the stack. https://github.com/storyblok/field-plugin/pull/260 All of the PRs in the stack were approved. All the branches were up to date (restacked). No conflict was reported on the merge button of the PR on GitHub. After checking them all, I started merge of the whole stack on Graphite, but in the middle, conflicts appeared. Let me know if I can help in any way.

Hi Eunjae, I'll try and take a look at this today. Do you have any more recent examples? It looks like we no longer have the merge logs from the PR you previously provided.

I have merged stacks so far three times via Graphite. And each and every time it failed with conflicts (reported them here every time). Tbh, I'm too stressed and feel sorry that I'm making troubles to my teammates. That 13 days ago was my latest merge.