Re: git pull for update of netdev fails.

From: Linus Torvalds <torvalds@osdl.org>
Date: Sep 20, 2006, 17:34 UTC
Message-ID: <Pine.LNX.4.64.0609201032000.4388@g5.osdl.org>
In-Reply-To: <20060920165931.GE23260@spearce.org>

On Wed, 20 Sep 2006, Shawn Pearce wrote:

Show 6 quoted lines

> 
> Yet people (typically those new to Git) will still pull or merge
> the wrong branch in, work on top of that merge, publish it, others
> will build on that... and wham; that topic branch head which you
> wanted to rebase prior to merging is now wedged 50 commits deep in
> your history.

Yes. It might well be a good idea to mark temporary branches some way on the sending side, and have "git pull" honor that marking by default.

The only really good marking we'd have (unless we extended the protocol a lot) is name-based, ie we could have a separate directory for "temporary branches".

Of course, nothing will ever really avoid outright mistakes, which is probably the bulk of things. I think a lot of those go away when you get used to the flow, but especially in the beginning, people _will_ make mistakes.

So maybe trying to avoid them too much is just futile.

		Linus