Working with Git

[Lawrence Velázquez]

> On Nov 3, 2016, at 10:29 PM, Rainer Müller <raimue at macports.org> wrote:
> 
> While Larry's version ensures you will always do a rebase, the version
> from GitHub could fall back to a merge.

Right. My intention is to always avoid merges.

> Assuming the 'git pull' results in a fast-forward, both command
> sequences should be equivalent as far as I can see.

Right.

The problem is that the base branch and head branch will probably have
diverged by the time someone gets around to handling the PR, so "git
pull" will more likely than not end up trying to do a non-ff merge. So
I avoid it entirely.

vq