What is the best way for distributed conflict resolution during merge in git? (deliberate partial commit)

Question

Assume the following:

1. A team of several designers (DesignerA,DesignerB,DesignerC ...).

2. Main branch "master"

3. Two featu