What is the best way to pull in new commits from a related commit?

[stephenwithav]

Scenario

My team has a multi-issue ticket called feature-1 that needs to eventually be merged into main.

feature-1 is the parent branch of feature-1.[a-j].

I am in charge of feature-1.c and my teammate Chuck is in charge of the parent feature-1 branch. I'm coding along, adding 6 new commits to feature-1.c when suddenly Chuck adds 2 new commits to feature-1.

Question

What is the best workflow for bringing Chuck's commits into my feature-1.c branch?

Options:

1. I can merge Chuck's new commits into my branch with m m.
2. I can rebase my branch onto Chuck's branch with r s, choose feature-1, then choose which commits to replay after Chuck's branch.
3. ???

What is the most effective option? I'm currently using Option 2, but I'm guessing there's a less convoluted option.

Recommendations?

[tarsius]

Op closed this and opened an identical discussion at magit/magit#5457. So let's discuss it there.