The branch that took four days to merge

• A

  The team should use a different merge strategy

• B

  Conflicts ought to be resolved by simply taking whichever version is newer

• C

  The files should be split up so fewer people touch them

• D

  The cost came from how long it lived apart, so merge in often and keep changes small