Lines Matching full:merge

91 It manages updates by doing a three-way merge of changes made to these
96 To perform a three-way merge,
104 During a merge,
117 then a merge conflict is generated.
118 The conflict must be resolved after the merge has finished.
121 utility will not perform a new merge until all conflicts from an earlier
122 merge are resolved.
192 will attempt to merge the changes into the version of the file in the
194 If the merge encounters conflicts,
197 If the merge does not encounter conflicts,
202 is not able to safely merge in changes to a file other than a merge conflict,
223 if any warnings were encountered they are displayed after the merge has
285 to perform a merge without requiring a source tree that matches the
325 mode is used to resolve any conflicts encountered during a merge.
364 mode shows a summary of the results of the most recent merge.
366 Next it lists any warnings generated during the last merge.
367 If the last merge did not generate any conflicts or warnings,
400 Specify an alternate destination directory as the target of a merge.
464 merge.
505 Do not merge any changes to the destination directory.
507 report what actions would be taken during a merge.
532 Only merge changes to files that are necessary to successfully run
560 trees during a merge.
563 a previous merge operation.
599 Specify a program to edit merge conflicts.
644 environment variable to edit merge conflicts.
668 To merge changes after an upgrade via the buildworld and installworld process:
672 To resolve any conflicts generated during a merge:
727 can be merged via a regular merge.
729 The following warning messages may be generated during a merge.
741 merge operation.
823 was updated during a merge with a non-empty destination directory.
911 Rerunning a merge does not automatically delete conflicts left over from a
912 previous merge.
913 Any conflicts must be resolved before the merge can be rerun.
927 that cause conflicts in the first merge.