/relock-conda command on PRs with conflicts in the lock file

[beckermr]

For PRs where the are merge conflicts on the lock file, it'd be nice for the /relock-conda command to be able to resolve the conflicts.

Here is one idea:

1. Remove the lockfile on the head branch.
2. Copy in the latest lockfile from the base branch.
3. Make a commit and merge in base branch?
4. Relock the env
5. Push the new lockfile.

Thoughts @jaimergp?

[beckermr]

We probably only want to do this if the lockfile is the only thing that conflicts.

[jaimergp]

Yea those steps should work. Rebase lockfile from target, relock and push, right?