> Well, that gave me about a 100 conflict files, which is interesting > since there are only 8 files in the aptui branch that are actually > different. So is it possible to extract all the commits in a single directory (www/aptui) from the aptui branch and stick them into a clean home (branch or master)? Lbs