git merge - Resolving a part of conflict in a file in GIT -

the scenario discuss have merge repository shared repository developers cd resolve merge conflicts.

1. there 2 or more merge conflicts in single file.
2. each conflict has resolved different user.
3. each developer cd repository resolve merge conflict.
4. let foo.c has 3 merge conflicts
5. one user resolves single conflict in foo.c , save in graphical merge tool

now git recognizes "git add" though there still conflicts in other parts of file. if developer "git mergetool foo.c" doesnt pop foo.c conflicts.

is there graphical tool resolves issue. allows multiple users resolve , save conflicts in same file.

this scenario doesn't make sense...

firstly, if there conflict, conflict exists on 1 merge commit, doesn't exist yet! (it's still on user's machine, possibly in index, not in local tree).

the other users not have conflict @ all, until merge, or rebase.

supposing have 3 users doing exact same merge, whatever reason may be, , therefore have same conflicts.

lets further suppose they, suggest, each have conflict can reconcile, should each rebase work on latest version of code, , reconcile conflicts in process.

in other words, situation seem describing follows: (correct me if i'm wrong):

1. we have 3 devs, charlie, john, , matt, working off master branch, @ commit aaaaaaa.
2. they work on 'unstable' branch, @ commit bbbbbbbb, has diverged 'master'.
3. they all, at same time, decide should merge 'unstable' branch 'master', individually.
4. they all, at same time, realise have commits can't reconcile.

ideally, should done in situation, 'unstable' should merged in developer knows how merge. perhaps choose merge few commits @ time, rather directly merge 2 heads, or perhaps choose rebase whole thing - whatever, 1 developer needs this.

the more done, easier merge/rebase operation be. 

the remaining developers able use merge commit.