All you can do , and this depends on you neighbor and where the house is located is to build berms to divert the water from you property onto the street or any where away from your house that is not occupied.
Does it flow onto your property or just raise up like a pond being filled?