Unless you do it in a high-tech company such as Erik's, where they are shy to tear off a pin and use a bigger drop of solder* :-) .... * explanation to Erik: you mentioned you had to rerun a board because of XTAL1/XTAL2 were exchanged - this is what I'd do, tear off the offending pin and use more solder to connect the good one, on the prototype

If I gave you the impression that our protos do not have cuts and pastes, you misunderstood me. However no production board shipped to a customer can have such. So, in relation to the actual case we "had to rerun a board because of XTAL1/XTAL2 were exchanged" before procuct could be shipped. The fact that it was not needed for the proto does not make the cost and delay caused by a rerun any less.