When do I use update vs merge? If I do a pull from a remote repository, I'm reading that I have to do update to get those changes into my working directory. But others times I'm reading that I have to do merge.

Do I maybe want to always do an update after a pull, and then do a merge only if there are conflicts?

What am I not understanding here?