Your question is Git Rebase vs Merge. Take a moment with it on the right.
Talk me through your thinking if you like. When you're confident, submit your answer and I'll grade it like a real screen (7/10 or better passes).
Explain the difference between git merge and git rebase, and when you would use each in a team environment.