[ < ] [ > ]   [ << ] [Plus haut] [ >> ]         [Top] [Table des matières] [Index] [ ? ]

33.4 Merging Files with Emerge

It's not unusual for programmers to get their signals crossed and modify the same program in two different directions. To recover from this confusion, you need to merge the two versions. Emerge makes this easier. For other ways to compare files, see Comparing Files, and Ediff: (ediff)Top section `Top' dans The Ediff Manual.

33.4.1 Overview of Emerge   How to start Emerge. Basic concepts.
33.4.2 Submodes of Emerge   Fast mode vs. Edit mode. Skip Prefers mode and Auto Advance mode.
33.4.3 State of a Difference   You do the merge by specifying state A or B for each difference.
33.4.4 Merge Commands   Commands for selecting a difference, changing states of differences, etc.
33.4.5 Exiting Emerge   What to do when you've finished the merge.
33.4.6 Combining the Two Versions   How to keep both alternatives for a difference.
33.4.7 Fine Points of Emerge   Misc.

Ce document a été généré par Eric Reinbold le 23 Février 2009 en utilisant texi2html 1.78.