On 15 August 2015 at 21:56, Andrew Savchenko <birc...@gentoo.org> wrote: > And even with current thin-manifest > workflow there may be conflict if they touch the same files.
They'll be single-line conflicts though, which will mean assuming different developers touch different files, git will be able to trivially merge them, because the lines impacted on either sides are unique. Signing both sides of the conflict means you have ~20+ extra lines of conflict that git has to make you choose between, .... where *neither* side is correct, and you have to dispose of the conflicted data manually, and regenerate it from scratch in the middle of the merge. -- Kent KENTNL - https://metacpan.org/author/KENTNL
