Pull Request squash and merge constant blockage

Hey Everyone!

So the team I work on has a monorepo structure with squash and merge resolution of feature branched into pre-release branch. Before we can squash and merge, our branch must be up to date with the pre-production branch and pass CI build tests.

Now, because our team is expanding, everytime i want to squash and merge, odds are someone merged their branch before I was able to. Now i have to update my branch with the pre-production branch and wait for CI builds to test and pass again ( can take upwatds of 18mins).

Are there any version control flows with github that would remove this annoyance without sacrificing stability of feature branch merges.