One piece of advice I received that I've found very useful is never to let the sun set on an argument. On the rare occasion I find myself in a row, I will always resolve it before bedtime, whether the other party likes it or not. 'Always forgive your enemies; nothing annoys them so much.' (Oscar Wilde).
That's a good one and well worth the effort. I've had many late nights trying to enforce that rule (I can be stubborn when arguing) but for sure it's best to get things straight. Also, old Oscar knew what's up huh?