Hey DEV.TO community! First off, as a newcomer, I'd like to say that this community has been absolutely exceptional thus far!

I was hoping to get some help today with my Git/Github workflow. I am collaborating on a React JS project with another developer. This is the first time either one of us have ever collaborated on a project, so we are a bit stuck on the workflow.

So far we understand that we pull from the Master branch and each create a new branch for the features we will be working on. We understand that once those features are complete, we merge them into the Master. However.. We are unsure how we can go about merging our branches together in a 'Staging/Dev branch' to determine if they are working correctly with one another, before pushing to the Master.

Is that the right way to do it? Merge them both into a new branch before pushing to Master?

I'd also like to know, if we do merge our branches together in some sort of staging branch (if that is the best workflow), would we then merge that staging branch into our original feature branches that we are currently working on to continue developing with each others code present in our branches?

TL/DR; How do you test two separate branches together to ensure the code is working before merging the branches to Master?

I hope I was able to make my question clear, thanks DEV.TO!