Lines Matching full:conflicts

121 utility will not perform a new merge until all conflicts from an earlier
194 If the merge encounters conflicts,
197 If the merge does not encounter conflicts,
325 mode is used to resolve any conflicts encountered during a merge.
328 iterates over any existing conflicts prompting the user for actions to take
365 First it lists any files for which there are unresolved conflicts.
367 If the last merge did not generate any conflicts or warnings,
393 This can be useful to avoid gratuitous conflicts in
415 trees as well as unresolved conflicts.
429 During an update this can simplify handling for harmless conflicts caused
550 Any conflicts generated during a
599 Specify a program to edit merge conflicts.
644 environment variable to edit merge conflicts.
672 To resolve any conflicts generated during a merge:
911 Rerunning a merge does not automatically delete conflicts left over from a
913 Any conflicts must be resolved before the merge can be rerun.
927 that cause conflicts in the first merge.