Git merges by default when you pull, for one.

Another extremely common pain is trying to "delete" a local commit.