[95025]

I agree with cgoll; sounds like a perfect place to have a raised garden with an adjoinging berm. I think though that the first thing I would do is attend a planning commission meeting, keeping your cool, just as the engineer suggested, and ascertain that she can in fact continue to divert water onto your property.

Indeed - on all counts.

I'd suggest building a levee along your property line. Just refer to it as a raised flower bed. Let the water get 6" deep in her yard, and she might start being cooperative.

 

[95025]

^^ Build up the level of your yard so that the water is forced to stay on her yard.

 

[95025]

While that's a good suggestion I think it can be very costly seeing is it has to pass city inspection. I contacted the county but they said it was a city matter, the city said it was my problem but I can't mess with function of the swales. So... that's B.S.

BS is right.

If it's your problem, on your property, you can fix it. Just run a long, raised flower bed back there. Landscape it nicely. Forget to tell the city.