• Yorick Peterse's avatar
    Reinstate changes lost due to automatic merging · 749ebc1c
    Yorick Peterse authored
    The automatic merging code used `--strategy=ours`, which turned out to
    be incorrect; instead we wanted `--strategy=recursive
    --strategy-option=ours`. This small difference results in merging
    throwing away _all_ EE changes in favour of CE changes, instead of only
    doing this for conflicts.
    This commit ensures that EE has all the appropriate changes. The diff
    was generated by cherry picking all merge commits made since two days
    ago, picking them with `--strategy=recursive --strategy-option=ours`.
ssh_public_key.rb 2.18 KB