Skip to content
Snippets Groups Projects
Select Git revision
  • passt default
  • master
  • pu
  • todo
  • next
  • maint
  • v2.8.0-rc1
  • v2.8.0-rc0
  • v2.7.2
  • v2.7.1
  • v2.7.0
  • v2.6.5
  • v2.7.0-rc3
  • v2.7.0-rc2
  • v2.7.0-rc1
  • v2.7.0-rc0
  • v2.6.4
  • v2.6.3
  • v2.6.2
  • v2.6.1
  • v2.3.10
  • v2.5.4
  • v2.4.10
  • v2.6.0
  • v2.6.0-rc3
  • v2.5.3
26 results

git-gui

  • 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>