How can we make sure that merges into main (trunk) don't overwrite other peoples merges if you haven't rebased before they merge? It seems we've run into this issue a few times and I thought Graphite was supposed to block that. What is the blocking mechanism and how can we dig in to see what went wrong in our case? Any docs/pointers that I can share with the team?

(If applicable) To help us more clearly understand what you're trying to do, please provide additional details about: - Screenshots / debug logs / list of commands you've tried to run so far - Your workflow - Current state

We got a new P&ID error last night. That is why I dug into it to see what has caused the issue. It turned out that @Rahul's last commit was not up-to-date by main and it has reverted some previously removed functions from the P&ID piepline. Just a reminder for everyone to start from the most up-to-date main branch. Second screenshot is where they are removed. Third is where they are added back.

Hey Moe, was that PR pushed in graphite? Looks like you have our merge queue turned on for this repo? what do your branch protection rules look like? do you have

“restrict who can push to matching branches”

set to only include the Graphite app?