I question a relationship where one partner says 'Just kidding!" after seeing how upset an issue made the other.

If you guys came to an understanding/compromise when it came up, then would have been the time to say he's just messing with you. Not later when he's clearly trying to backpedal his mistake...