There was not an ir that made terms of shalom with the Bnei Yisroel, except Chivi the inhabitants of Giv'on; all others they took in milchamah.