I don't remember when I used `git pull` last time.
I've been all in on `git fetch` now. It never fails, and I can resolve conflicts offline at my own pace once the branch is fetched.
@dcz "offline" seems an odd term to use with git.
@lwriemen But it's the entire point!
Pre-distributed version control was very online: you couldn't make your changes without worrying that others are blocking your changes.
With git, you can actually make your own mess, offline, not affecting anyone else.
@dcz That's what I meant. Even when merging via pull or rebase you're working offline.