Re: : Networking

Linus Torvalds wrote:

On Tue, 26 Apr 2005, Andrew Morton wrote:

quoted

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