How to merge changes in config files during updates?

[MountainX]

Where can I find information about merging changes?

I assume the "+" indicates a new line and the "-" represents an old line that will be replaced, right?

Some lines are just there for context, right?

What is "+++" or "---"?

Is there a way to use a visual diff/merge tool while update manager is running?

Where do I locate the new version of the file being compared?

Which visual diff tool is best?

Thanks

[yther]

Hey, good questions! I'm going to watch this to see what people say. :)

You're right about the + and - lines. Lines without either are, indeed, context.

I once used a program called xxdiff, which is in the repos. There seem to be a few others, too. :)

One thing I miss about Gentoo was the fact that, during an upgrade, you could choose to interactively merge the new version. For each changed section, you could accept, reject, or even edit the changes. This saved me time because I didn't have to go compare the files by hand later.

I wonder if there is any similar method we can use here...

[MountainX]

Hey, good questions! I'm going to watch this to see what people say. :)


Hey people, any input please? You have an audience if you want to say anything on this topic ;)