On Fri, Jun 02, 2006 at 03:19:47PM -0700, Auke Kok wrote:
> Because upstream and upstream-fixes have a whitespace conflict in them,
> I've prepared two separate git branches to pull from so that a subsequent
> pull or merge from upstream-fixes into upstream doesn't resolve into a
> conflict:
That won't work, because it creates duplicate changesets in the history.
I'll pull the upstream-fixes version, and then merge into #upstream.
Jeff
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
