There are many parameters that would affect the answer to your problem: Steepness of slopes, drainage patterns, surrounding properties, size of your yard, surfaces, etc.

Generally water problems are cured by enhancing the natural drainage pattern of the your property and the neighborhood.

Unless there are other issues, using fill dirt to build a diversion berm on the uphill side of the property should work. You have to be careful not to divert floodwaters onto your neighbors' property. If that might be a possibility, get with the neighbors first before you do anything and you might be able to build a diversion ditch between the properties where the water can flow.

Here is a picture showing how a neighborhood was built with swales and berms in SoCal.