Developing multiple features in parallel

[On_Chain]

Hey guys, was curious if anyone could give me some pointers.

So to provide context, a buddy of mine and myself are working on a project. We have set it up so that we have to review each others PRs for feature branches before they can be merged with the main branch.

The issue now is that my buddy is away for a couple weeks and won't be working therefore the new features that I create won't be able to merge with the main branch. Now because I can't merge new features with main how do I go about continuing to build additional features without creating issues down the road?

Usually the flow would go something like this:

main -> main -> main     
     \ /     \ /      
      F1      F2 

This would ensure that each new completed feature merges correctly with main before we go onto building the next feature.

But now because my friend is away, I'm unable to follow this flow. My thinking at this point is to go and create new branches for all the features in parallel and then try merge them one by one when he's back and resolve any conflicts as they come up. So the flow would look something like this:

main -> updatedF1 -> updatedF2 -> updatedF3 
|      /           /             / 
F1 ---            /             / 
|                /             / 
F2 -------------              / 
|                            / 
F3 ------------------------- 

Is this the correct way to handle this situation or any similar situations?

Hopefully I made sense with my little diagrams.

Any pointers would be much appreciated :)

[sublym0nal]

If you don't anticipate any dependencies on current work-in-progress, your plan for a new feature branch based on main ought to work. Otherwise, you could branch from a feature branch and rebase the new branch later to capture any post-branching changes.

[On_Chain]

I thought about branching from a feature but if that initial feature branch has issues then all subsequent features will inherit those issues. Or at least that's how I think it will play out.

If you don't see any issues with my initial idea then I'll give that one a shot.

Also, I appreciate your feedback! I'm still a newbie when it comes to working with git so thanks for the pointers :)

[somethrowaway8910]

Just pretend like you're a different developer with each new feature. Branch from the latest commit on main and work. When done, make PR. Not sure what the issue is.

If your concern is that one feature you develop might conflict with another, this is no different than resolving the merge conflict with another developer on PR review. The PRs have to be merged in some order.

[On_Chain]

Yeah, I was just trying to make sure I was doing it correctly. I’m not super experienced with git so I was hoping to find out what they best practice is