Riot police were scrambled to a north Edinburgh house after reports of a disturbance this morning.
A 30-year-old man was detained at Gunnet Court, Muirhouse, following a stand-off which lasted nearly six hours.
The suspect allegedly refused to allow police into the house, and officers were concerned about the welfare of a woman within.
A police spokeswoman said: “Police in Edinburgh are investigating following a public order incident at Gunnet Court.
“The incident was reported to police today at 2.30am and was resolved at around 8am.
“No one was injured as a result of the incident.
“A 30-year-old man has been detained and enquiries are currently ongoing.”