Re: git pull suggestion

Aghiles wrote:

Are you using 'git pull --rebase' or the equivalent branch.<name>.rebase setting?

If so, note that git-rebase (which does all the hard work) can't know the later conflicts once it hits the first one: your resolution of the first conflict constitutes the base onto which the further patches are applied. So depending on what changes you make during the resolution, there may be more or fewer conflicts in the rest of the rebase.

If not, I can't see how your question makes sense as ordinary 'git pull' does a merge, and during a 'git merge' there can only ever be one conflict resolution phase.