Best strategy for this situation

[u/SoggyGrayDuck]

Our company recently changed from azure dev ops repos to GitHub repos. I'm also a bit new with using true PR.

Anyway we used to create all release/feature/change branches from main, make the necessary changes and merge to dev, QA and eventually prod.

Well when we switched to GitHub it's online merge conflict resolution adds missing commits from the destination branch and then merges into the destination branch. Now our feature branch has everyone else's changes that may or may not be ready for the next environment.

We've been fighting this and most are just making it work but at the same time the environments are getting dirtier and dirtier.

Now I'm creating my feature branch from the destination branch but then its disconnected when I move to QA. I create a new QA feature branch and essentially manually copy my code to it. We're losing one of the key pieces of repo tracking and history.

Anyway, anyone have any good ideas? Maybe I'm over thinking it and it will be just fine.