Examples (5)
Merge all files needing resolution using the standard helper
Merge a specific file
git merge-index git-merge-one-file -- path/to/fileMerge multiple files, continuing on failures
git merge-index -o git-merge-one-file -- path/to/file1 path/to/file2 ...Quietly merge all files with a custom program
git merge-index -q merge-program -aInspect merge inputs for a file using `cat`
git merge-index cat -- pathmade by @shridhargupta | data from tldr-pages