jx upgrade boot wipes user requirements

[daveconde]

Summary

When running jx upgrade boot some user modifications to jx-requirements.yml can be wiped. This is due to the cherry picking commits from the boot config repository in to the dev env repository that defaults to accept theirs when a conflict is found. This can be seen below

// CherryPickTheirs does a git cherry-pick of commit func (g *GitCLI) CherryPickTheirs(dir string, commitish string) error { return g.gitCmd(dir, "cherry-pick", commitish, "--strategy=recursive", "-X", "theirs") }

We should exclude jx-requirements.yml from the cherry pick and find a way to correctly merge the changes.

Expected behavior

After running jx upgrade boot the jx-requirements.yml contains both user changed settings and updates from the upstream boot repo.

Actual behavior

After running jx upgrade boot the jx-requirements.yml is missing user changed settings.