![]() | |||||||||||||
Messages in this thread |
Linus Torvalds <torvalds@osdl.org> wrote: > So anything that got modified in just one tree obviously merges to that > version. Any file that got modified in two trees will end up just being > passed to the "merge" program. See "man merge" and "man diff3". The merger > gets to fix up any conflicts by hand. "merge" does a better job than "diff3" since it can resolve the conflicts caused by similar changes to a "parent" file (this is available in both BK and GNU Arch). This is useful when you try to merge 2 branches that both include a patch which is not under the revision control. It also solves the conflicts caused by cherry-picking changes (just need to find the last consecutive common changeset as the common ancestor). -- Catalin - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ | ||||||||||||
| Last update: 2005-04-12 09:56 [from the cache] ©2003-2008 | |||||||||||||