The 20-year-old victim, who has not been named, was seriously assaulted in The Loan, South Queensferry, in the early hours of Sunday.
He was taken to hospital for treatment but later died.
A 46-year-old man has now been arrested and charged with murder following the incident, police said.
Loading article content
A 36-year-old woman was charged with the man's murder yesterday.
Both are expected to appear at Edinburgh Sheriff Court later today.