Repair quickly. Don't let things calcify.

Arguments are not the problem — slow repair is. The moment you feel the temperature dropping between you, be the first to soften. "I don't want to be in this with you. Can we reset?" The ego that wins the argument often loses the relationship.