![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Mon, 27 Nov 2006 00:45:39 +0000 (19:45 -0500) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Mon, 27 Nov 2006 05:48:49 +0000 (00:48 -0500) | ||
| commit | f70c3a2caccf4f0f5abfd3d0db4120e8659dd0d7 | |
| tree | f72f756978322cc4b31fd91e30b2ee45672bd6e9 | tree | snapshot |
| parent | 5e926cbf7eeb2c89e0957bed7941c2c6490767c2 | commit | diff |
git-gui: Enable resolution of merge conflicts.
If a file has a merge conflict (index state = U) the user will need to
run update-index on that file to resolve all stages down to stage 0,
by including the file in the working directory.
Like core Git we'll just trust the user that their resolution is
correct, and that they didn't just include the file into the commit
while merge conflicts still exist within the file.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
If a file has a merge conflict (index state = U) the user will need to
run update-index on that file to resolve all stages down to stage 0,
by including the file in the working directory.
Like core Git we'll just trust the user that their resolution is
correct, and that they didn't just include the file into the commit
while merge conflicts still exist within the file.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| git-gui | diff | blob | history |