Confused About Handling Multiple Branches in My GitHub Project – What’s the Best Workflow?

[aspoonlesson]

Hey everyone,

I’m currently working on a project with a few collaborators, and we’re running into some confusion managing multiple branches. We’ve got a main, a dev, and a few feature branches, but merging and resolving conflicts is becoming messy—especially when several people push updates at once.

I’ve read about different workflows like Git Flow and GitHub Flow, but I’m not sure which one is best suited for a small team (3–5 people) working on new features and bug fixes at the same time.

Could anyone share what branching strategy or workflow has worked sprunki phase 5 best for them in a similar setup? Also, how do you handle frequent merges without breaking the main branch?

Thanks in advance!