Your ideal 'making up' scenario involves...

A long, deep talk where every point is examined and understood. A clear apology and a concrete plan to fix the problem. Just moving on. A hug, a joke, and pretending it never happened. A tearful, emotional reunion where you both express how much you hurt.