7 ms·
You get those "Merge branch 'master' of github.com:Username/Repository" commits, that introduce "unnecessary nonlinearities in the history" (to quote the reply)
by Spittie 13y ago
You get those "Merge branch 'master' of github.com:Username/Repository" commits, that introduce "unnecessary nonlinearities in the history" (to quote the reply).
I mean, it's not an huge problem (and that's why I still use git pull), but it does comport some kind of annoyance.
- krisdol 13y agoIt seems that the SO answer doesn't understand that there is a `git pull --rebase` option. It attempts to rebase local commits on top of what was fetched, and by default shows merge issues if the conflicts could not be resolved automatically. It is my default for my workflow, but I will use different merge strategy when necessary (which is almost never).
- bronson 13y agogit pull --rebase would take care of those nonlinearities. In my experience, on projects with a few developers, --rebase is awesome.