Marcin Owsiany <mar...@owsiany.pl> writes: > "the index file saves and restores with all this information, so you > can merge things incrementally," > > which I took to mean that I can read from multiple trees one by one > before writing the tree.
That "incrementally" refers to "after a three-way merge stops with conflicts in multiple files, you can start from file A, concentrate only on that file, resolve it, and then go on to resolve conflicts in the next file B, continue, until you resolve the conflicts in the last file Z". Until you resolve a single tree-way merge fully and write the results out as a tree, you cannot merge in the next tree. That is why N-way octopus is internally implemented as a series of three-way merges. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
