1) document everything and copy to local law enforcement and city manager
2) write letter, perhaps in council with your attorney, advising her of specific property line specifics with suggestions on how to proceed in an effort toward civility
3) send her a card via mail with a peace offering of some kind - gift certificate, or send flowers
4) do not go forth with any action that would be construed as an act of escalation of said dispute(s)
Those are just a few thoughts off the top of my head. May apply or may not.
Good luck! I'd say we've all BTDT.....
