Jim Garrison <jim.garri...@nwea.org> writes:
> During my initial self-education I came across the maxim "don't pull,
> fetch+merge instead" and have been doing that. I think I followed
> most of the "pull is (mostly) evil" discussion but one facet still
> puzzles me: the idea that pull will do a merge "in the wrong
> direction" sometimes.
> Do I understand correctly that this occurs only in the presence of
> multiple remotes?
> Can someone provide a simple example of a situation where pull would
> do the "wrong" thing?
That's basically unavoidable. Two opposing directions are actually part
of the same workflow usually handled by "git pull":
"Codeveloper X sends a pull request to Y who maintains the mainline.
Y executes git pull to merge X' sidebranch into the mainline."
"Codeveloper X executes git pull in order to merge the mainline from Y
back into his private sidebranch."
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html