Thread (9 messages) flat view 9 messages, 2 authors, 2016-06-15

Re: [StGit PATCH 1/2] Do simple in-index merge with diff+apply instead of read-tree

From: Catalin Marinas <hidden>
Date: 2016-06-15 22:44:55

2008/7/2 Karl Hasselström [off-list ref]:
The advantage is that patch application will resolve some file content
conflicts for us, so that we'll fall back to merge-recursive less
often. This is a significant speedup, especially since merge-recursive
needs to touch the worktree, which means we have to check out the
index first.
Thanks.

-- 
Catalin
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help