@glyph I use fetch, merge, and also pull sometimes (with an explicit upstream & branch specified, never ever "git pull" on its own).

At first I learned to just do "git pull" and was always fucking up my work. Then I sat down with someone more experienced than me who taught me the flow I use now; it became clear quickly to me that being specific about what I do in atomic steps is just a safer way for me to interact with git.