Definitely aviod anything too spicy or acidic, avoid eating too quickly too as this will often make it a lot worse. I try to break meals up into smaller portions so I'm not having huge amounts of food all at once, even if it means I wind up eating like a hobbit (breakfast, second breakfast, elevenses, lunch, afternoon tea, dinner).

And when all else fails - Rennie is my friend.