Rule #1 when merging should *always* be: "never leave the user high and 
dry".  You don't give up and say "I can't merge this".  You say "I couldn't 
merge this, but here's the mess I left for you to show me how it's done!"

		-- Linus Torvalds