If you're aggravating an existing injury you are probably better off resting it until it's recovered. The idea of working through an injury only works for so long.

If it is mainly caused by inflammation then diet will help. Supplements like fish oil and glucosamine are good but it's the food you eat that can help or hinder your recovery.

Most processed foods will hinder and natural unadulterated foods will help. Certain foods will help more than others. Google anti inflammation diet and you will find a whole list of good foods.

It's a long term treatment rather than instant cure so probably best to change your exercises for a while as well
Hope this helps.