git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: : Networking

From
BCBram Cohen <bram@bitconjurer.org>
Date
Apr 26, 2005, 20:35 UTC
Message-ID
<Pine.LNX.4.44.0504261332540.4678-100000@wax.eds.org>
In-Reply-To
<Pine.LNX.4.58.0504261310120.18901@ppc970.osdl.org>
Linus Torvalds wrote:
Show 11 quoted lines
> On Tue, 26 Apr 2005, Andrew Morton wrote:
> >
> > With bk I was resolving that by just smashing the patches on top of each
> > other, ignoring the rejects and refreshing the topmost patch.  That
> > approach actually resolved this linus-vs-davem dupe as well.
>
> Oh, wow. I didn't realize that your scripts were quite _that_ stupid, and
> didn't actually take advantage of any automatic merges at all.
>
> If so, git should trivially do everything that BK ever did for you. Which
> is not saying a lot ;)

No version control system will do a particularly good job of merging content which got passed around outside of the system. They can be made to sort-of handle some simple cases well, but fundamentally too much information is getting dropped.

The solution is to get everyone using the same version control system, which is actually quite a workable solution if (a) the version control system in question is quite nice, and (b) there isn't some deep political reason why many people will never agree to use it.

-Bram
Previous: Linus TorvaldsNext: Ryan Anderson
Message 11 of 13 in “Re: : Networking”
  1. Andrew MortonApr 26, 2005
  2. Linus TorvaldsApr 26, 2005
  3. Daniel BarkalowApr 26, 2005
  4. Petr BaudisApr 26, 2005
  5. Jan HarkesApr 26, 2005
  6. Petr BaudisApr 26, 2005
  7. Andrew MortonApr 26, 2005
  8. Linus TorvaldsApr 26, 2005
  9. Andrew MortonApr 26, 2005
  10. Linus TorvaldsApr 26, 2005
  11. Bram CohenApr 26, 2005
  12. Ryan AndersonApr 28, 2005
  13. Daniel BarkalowApr 28, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.