2 ms·
How do weave files cope with history diverging across copies, moves, and deletes? How do they handle file/directory conflicts across different branches?
by fanf2 3y ago
How do weave files cope with history diverging across copies, moves, and deletes? How do they handle file/directory conflicts across different branches?
- gavinhoward 3y agoHistory diverging is only a problem if the same branch is different across different checkouts. Since Git's branches are a bookmark, this is a problem for Git. My tool has full branches, and your master branch is considered a different branch than the default master of the origin remote. And to handle them across branches, each branch will have its own weave file, rooted at a parent. (There will be some optimizations.)