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