It implies a quick and easy resolution, often achieved through a gesture of affection like a kiss.
Here's how it's used:
* "After a huge fight, they kissed and made up within an hour."
* "My brother and I always fight, but we always kiss and make up eventually."
The idiom suggests that even though there may have been conflict, the relationship is ultimately strong enough to overcome it and restore harmony.