Constant Conflicts

[broguinn]

Hi folks. My team has been onboarded for a few weeks now, and I'm not seeing the benefit I thought I would. Two examples:

1. In even the simplest stack case with two branches, if I add a commit to the first branch, a gh stack sync fails, and a gh stack rebase forces me to confirm the diffs of the second PR for every file that both touch.
2. Twice in a row now, when enqueueing my stack in a merge queue, the second branch has magically developed conflicts after the first branch merges. Example.

These are exactly the problems I'd expect this tool to solve.

[broguinn]

Update: for the above linked stack, I was able to run gh stack sync and automatically resolve the issue without a rebase. Why didn't github do this automatically? I would have expected both PRs to be squashed into their own commits onto main.