Skip to content
Snippets Groups Projects
Select Git revision
0 results

git-gui

Blame
    • Shawn O. Pearce's avatar
      f70c3a2c
      git-gui: Enable resolution of merge conflicts. · f70c3a2c
      Shawn O. Pearce authored 
      
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: default avatarShawn O. Pearce <spearce@spearce.org>
      f70c3a2c
      History
      git-gui: Enable resolution of merge conflicts.
      Shawn O. Pearce authored 
      
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: default avatarShawn O. Pearce <spearce@spearce.org>