Depends on available space. Zero ohm resistor is easy to populate during assembly and does not require you to short a header for normal operation. Whether you have space for a connector footprint in addition to that or just shape the pads so a surface mount header can fit on it (make them longer) depends on the circumstances. For stability you probably want something like a 2x2 or 3x2 block of headers if surface mount, but not all pins have to be soldered.
Ah! The stability issue alone explains the mention of parallel connections rather than jumping straight to combined footprints. And then space influences the best solution to use. Got it.

I have also heard that pick-and-place machines are happier with 0-ohm headers, and you can always desolder them if they're in the way.
Yep, if the trace is long and wide enough, you should be able to solder a header.
.18mm width for power. We'll soon seen if that is wide enough. :}
I took a spare experimental board and had a blind experiment with exposing and cutting tracks. It turns out that I can remove the soldermask very easily and with a reasonable degree of precision. I can break a track, but my technique is sloppy and I don't think I can do that with precision yet. However, for the tracks I most need to break, there should be enough space around them that I can get away with it for now.
I can't yet test soldering SMT headers as my entire supply of SMT headers is one 2x2 1.27mm header and I have no suitable 1.27mm jumpers wire or shunts. I'll need to do some shopping.
Indeed. Much smaller than standard 2.54mm headers, but still easily available and reasonably cheap. I think you can even buy them cheaply on eBay/AliExpress if you are so inclined. Also the footprint is very simple (two pads in line). Of course through-hole 2.54mm is the sturdiest if you have the space.
Sounds good. Space is frequently an issue, but I'm guessing that for key parts of the design 2.54mm through-hole is still worth it. Re shopping, yeah, I'll be needing to do some.
Neither is the ideal solution if you are dealing with amps of current.
For the most part I'm keeping under 500mA, but it is something to bear in mind in case I work on something with higher currents in the future.
A jig with pogo pins can work on the minimal amount of space (just some pads without solder mask), but you will need to hold the jig to the board somehow.
Excellent, thankyou. I've started experimenting with pogo pins but have not yet experimented with a jig. I would be converting my existing test system to something like that if I end up needing to do larger test batches.
Thankyou for your explanations and all of the detail, much appreciated.

I feel a lot more comfortable making board mods to get the extra measurements I need. Thanks also for the tips for better design.

No, this is for the early prototype/development board only.
Cool. I thought this might be the case. I had a *lot* of followup questions if the answer was yes.

Remeber what the purpose of the first/early prototpyes : to test out and prove the circuit, to try out and allow circuit changes and to allow measurement and verification of the circuits.
Thanks for the advice. I've been fairly fortunate on first runs on PCBs thus far. My current board turned out fairly well for a first run. I'm looking to improve it though, and to do this I need to do a fair bit of measurement. As happy as I am with the board, the current iteration of the board is *very* deficient when it comes to current measurement. In fairness, I didn't know some of the tricks and techniques mentioned in this thread, nor did I know that I'd need to make the measurements that I do.
If they are left in, it is common to just join them with track. They can then be cut and the header populated if needed.
That's really clever, I like that.

Assuming I'm thinking about this the right way: The default config is connected, but if you are developing you just need to break a small segment of track and solder on a header. You can then restore if you need to by removing the headers and soldering in a short piece of wire through the two holes.
The through hole is my personal preference because they are far more sturdy than the sufrace mount headers. I have seen surface mount headers tear the PCB pads clean off the PCB 
Yikes! It sounds like I was very lucky then. As mentioned earlier I lost a through-hole header kludged onto a board and from the sound of it, it could have been worse.
Thankyou very much for your advice, experience and suggestions re design improvements.

This has given me me plenty of ideas for improvements that I can use in my next board iteration that should make the testing process much smoother.