Peace Jkhan,
I do not agree with your conclusions. But I recognize that the use of the English term "conquered" in my last post was not really appropriate.
But before we start, we have to clarify a point about what you said: "of course no victory without fighting" = a victory can be the result of a fight or not (unless I misunderstood your point).
So now, let's take a larger overview to better understand these 2 verses: 48-24 and 48-25.
These two verses are part of a larger whole which goes from verse 18 to verse 27. I will not go into the details of its structure here but we will highlight some important inks-elements (Translation from shakir) :
"
[48-18] Certainly Allah was well pleased with the believers when they swore allegiance to you under the tree, and He knew what was in their hearts, so He sent down tranquility on them and rewarded them with a near victory,
[48-19] And many acquisitions which they will take; and Allah is Mighty, Wise.
--------------------------
[48-20] Allah promised you many acquisitions which you will take, then He hastened on this one for you and held back the hands of men from you, and that it may be a sign for the believers and that He may guide you on a right path.
[48-21] And others which you have not yet been able to achieve Allah has surely encompassed them, and Allah has power over all things.
[48-22] And if those who disbelieve fight with you, they would certainly turn (their) backs, then they would not find any protector or a helper.
[48-23] Such has been the course of Allah that has indeed run before, and you shall not find a change in Allah's course.
[48-24] And He it is Who held back their hands from you and your hands from them in the valley of Mecca after He had given you triumph over them; and Allah is Seeing what you do.
[48-25] It is they who disbelieved and turned you away from the Masjid al-Harâm and (turned off) the offering withheld from arriving at its destined place; and were it not for the believing men and the believing women, whom, not having known, you might have trodden down, and thus something hateful might have afflicted you on their account without knowledge-- so that Allah may cause to enter into His mercy whomsoever He pleases; had they been widely separated one from another, We would surely have punished those who disbelieved from among them with a painful punishment.
[48-26] When those who disbelieved harbored in their hearts (feelings of) disdain, the disdain of (the days of) ignorance, but Allah sent down His tranquility on His Messenger and on the believers, and made them keep the word of guarding (against evil), and they were entitled to it and worthy of it; and Allah is Cognizant of all things.
[48-27] Certainly Allah had shown to His Messenger the vision with truth: you shall most certainly enter Masjid al-Harâm, if Allah pleases, in security, (some) having their heads shaved and (others) having their hair cut, you shall not fear, but He knows what you do not know, so He made besides that near victory.
"
----------------------
Thus, we have 2 different time sequences:
1) Aborted attempt of Pilgrimage to Masjid al-Harâm => prevented. Negotiation with not fight (almost!)- In red below
2) then, another year, Pilgrimage success to Masjid al-Harâm without final victory over the Makkans = Triumph - In Orange below
In green in the text, the result of the transition from time sequence 1 to time sequence 2 = ultimately, Triumph for Allah.
----------------------
"
[48-18] Certainly Allah was well pleased with the believers when they swore allegiance to you under the tree, and He knew what was in their hearts, so He sent down tranquility on them and rewarded them with a near victory,
[48-19] And many acquisitions which they will take; and Allah is Mighty, Wise.
--------------------------
[48-20] Allah promised you many acquisitions which you will take, then He hastened on this one for you and held back the hands of men from you, and that it may be a sign for the believers and that He may guide you on a right path.
[48-21] And others which you have not yet been able to achieve Allah has surely encompassed them, and Allah has power over all things.
[48-22] And if those who disbelieve fight with you, they would certainly turn (their) backs, then they would not find any protector or a helper.
[48-23] Such has been the course of Allah that has indeed run before, and you shall not find a change in Allah's course.
[48-24] And He it is Who held back their hands from you and your hands from them in the valley of Mecca after He had given you TRIUMPH over them; and Allah is Seeing what you do.
[48-25] It is they who disbelieved and turned you away from the Masjid al-Harâm and (turned off) the offering withheld from arriving at its destined place; and were it not for the believing men and the believing women, whom, not having known, you might have trodden down, and thus something hateful might have afflicted you on their account without knowledge-- so that Allah may cause to enter into His mercy whomsoever He pleases; had they been widely separated one from another, We would surely have punished those who disbelieved from among them with a painful punishment.
[48-26] When those who disbelieved harbored in their hearts (feelings of) disdain, the disdain of (the days of) ignorance, but Allah sent down His tranquility on His Messenger and on the believers, and made them keep the word of guarding (against evil), and they were entitled to it and worthy of it; and Allah is Cognizant of all things.
[48-27] Certainly Allah had shown to His Messenger the vision with truth: you shall most certainly enter Masjid al-Harâm, if Allah pleases, in security, (some) having their heads shaved and (others) having their hair cut, you shall not fear, but He knows what you do not know, so He made besides that a near victory.
"