Occupation or settlement?

The ongoing debate between the different schools of thought was whether the land was conquered by Joshua ben Nun or was there a quiet settlement?