Here's a conceptual approach for merging two or more block chains that are created as a result of lack of network connectivity between parts of a network.

http://bitcoinery.tumblr.com/post/6731628999/how-to-merge-bitcoin-block-chains

Essentially, the suggestion is to not simply discard smaller chains, but to merge the differences back into the longest chain. This maintains all existing properties of bitcoin.