If you get into a fight with a friend or guard, you can yield by sheathing your weapon (
on the PC, 
on the PS3, or 
on the Xbox). If your opponent is willing, he will stop the fight.
Guards may accept your yield, but they will still try to arrest you if you have a bounty.