The city and the factory began warring late last year, when residents began to complain of a spicy odor that caused headaches, heartburn and watering eyes.

The trial was scheduled to begin this November, and the public nuisance declaration would have eventually authorized city officials to enter the factory and make the changes themselves.

But city officials said Huy Fong Foods Inc. had finally demonstrated a specific written commitment to solving the smell issues. Mayor Mark Breceda, who toured the factory earlier this week, said the conflict should not have been so drawn out.

“We’re almost sorry that this has gone on so long,” Breceda said. “We’re looking forward to being partners for a very long time.”

The council voted unanimously to table the resolution and decided in closed session to drop the lawsuit.

Huy Fong Foods Chief Executive David Tran was not present at the meeting but thanked his supporters in a statement to the Los Angeles Times.

“From now on, I will be concentrating on making my hot sauces quality better and better, with the price being lower and lower,” Tran said.

It wasn’t immediately clear why the city has relaxed its position. Tran has promised before to fix the issues, in writing and in person at council meetings through an attorney, but…