Re: git pull for update of netdev fails.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On Wed, 20 Sep 2006, Shawn Pearce wrote:
> 
> 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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]