News for hackers. Stuff that matters.

A comment on Why is git pull considered harmful? (2013). Parent comment

Re:Why is git pull considered harmful? (2013) by Spittie on Wednesday March 12, 2014 @11:00AM (#7385958)
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.

[ Parent | on HN ]
Re:Why is git pull considered harmful? (2013) by krisdol on Wednesday March 12, 2014 @11:11AM (#7386014)
It 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).
[ Parent | on HN ]
Re:Why is git pull considered harmful? (2013) by bronson on Wednesday March 12, 2014 @11:16AM (#7386052)
git pull --rebase would take care of those nonlinearities.

In my experience, on projects with a few developers, --rebase is awesome.

[ Parent | on HN ]