> I don’t know git well, but I often run into the problem being discussed. I do understand the problem being discussed; what I don't understand is what it has

> I don’t know git well, but I often run into the problem being discussed. I do understand the problem being discussed; what I don't understand is what it has to do with pushing first. You have the same problem no matter which order you use `git push` vs `git pull`. > I think that if I don’t pull first, but my changes don’t conflict with any part of what was done by the previous commit(s) I missed, I’ll still have to merge if I touched a file they touched. Yes, that's true. > What I really want to do is undo my commit, pull, and redo my commit. Then I don’t have to figure out git merge. You can do that with `git pull --rebase`, which, as others have mentioned, you can set as the default behavior of `git pull` like this: https://news.ycombinator.com/item?id=27581416 https://news.ycombinator.com/item?id=27581416