Submit Hint Search The Forums LinksStatsPollsHeadlinesRSS
14,000 hints and counting!

Click here to return to the '10.4: Check changes made to Apache's config file' hint
The following comments are owned by whoever posted them. This site is not responsible for what they say.
10.4: Check changes made to Apache's config file
Authored by: merlyn on Oct 10, '05 06:30:51AM

In general, if you have to change a vendor-supplied file, it's best to also maintain the "original" file for easy access as well. Then, when the vendor provides an update, you can do a "three-way" merge, which will generally lead to better results than trying to do a merge by hand.

You tell the three-way merge tool that both your file and the new vendor file are derived from the "common ancestor" of the original vendor file, and the tool can generally pick the right "differences" to place into the merged file. It's pretty slick. (You then save the new "vendor" file as your new baseline, so that a subsequent update is also merged properly by repeating the process.)

Emacs has a three-way merge mode. There's also "merge" at the command-line if you're a CLI-kinda-guy. Perhaps the developer tools also have a GUI three-way merge, but that's the keyword you're looking for.

[ Reply to This | # ]