The dispute between the Ministry of Education and King's High School has ended.
The Dunedin secondary school has agreed to introduce an enrolment scheme, and the school's roll will be capped at 1035 pupils.
Agreement was announced in a joint statement yesterday.
It will not take effect officially until 2017, but if the roll was to exceed the cap it would be brought forward.
''If the school roll goes over 1035, as defined by the March 2016 roll return, the enrolment scheme will be brought forward to apply from 1 May 2016,'' the statement says.
Last month, 1021 domestic pupils were enrolled at the school.
''King's High School is a successful school and we recognise its work in building a strong values-based education with a focus on lifting achievement for all boys,'' ministry head of sector enablement and support Katrina Casey said in the statement outlining the settlement.
''This will also ensure the network of schools across Dunedin is used well in the interests of all students, as there are plenty of spare spaces at other schools that take boys.
''An enrolment scheme for King's High will still enable the board to enrol a significant number of out-of-zone students, and won't affect boys already at the school,'' Ms Casey said.
Initially, the ministry told King's to establish an enrolment scheme this month or a limited statutory manager would be appointed, but then entered talks with the school.
King's board of trustees chairman David Booth said in the statement the school appreciated the swift resolution of the row.
The school board was confident the scheme would not prevent future pupils, regardless of location, from enrolling at the school.
Neither he, nor principal Dan Reddiex, could be contacted for further comment last night.
