Is There a Best Practice for Merging Code?

I taught myself to code about two and a half years ago, I think it is now. But I've never worked as a developer on a team. So that so for context is myself. Then there's one person who's focusing on sort of marketing community and partnerships. And then there's one other developer. It's been really challenging because I'm a pretty new developer.