On Sat, Dec 30, 2017 at 1:10 PM, Ian Zimmerman <[email protected]> wrote: > I realized I don't really understand it - I just repeat by rote some > keystrokes. In particular: > > What do the 'z' and 'n' commands do exactly, and what's the difference > between them?
The 'z' command throws away the new config file, leaving the existing config file in place. Use this when you don't care about the changes in the new file at all. The 'n' command skips over the current file, and does nothing. If you quit and re-run dispatch-conf, you should be prompted to do something with the file again. > After I do a 'm', how do I actually use the result of the merge? Is the > merged file now the same as the 'new' one, or the same as the 'old' one? > IOW, if I do 'm' and then 'z', will the merged version be the active > one? After completing the merge, use the 'u' command to use the merged version. Use the 'z' command to throw away the merged version and stick with the old file.
