cml pr: Add --merge option.

[daavoo]

It would be nice to have native support in CML for the cloud-agnostic equivalent of:

gh pr merge --rebase $(cml pr "foo")

[0x2b3bfa0]

on: pull_request
jobs:
  cml:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - uses: iterative/setup-cml@v1
      - name: Generate data
        run: echo "Hello World" > output.txt
      - name: Create and merge a new pull request
-       run: gh pr merge --rebase $(cml pr "output.txt")
+       run: cml pr --merge output.txt
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

[daavoo]

on: pull_request
jobs:
  cml:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
      - uses: iterative/setup-cml@v1
      - name: Generate data
        run: echo "Hello World" > output.txt
      - name: Create and merge a new pull request
-        run: gh pr merge --rebase $(cml pr "output.txt")
+        run: cml pr --merge output.txt
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Things to consider, when using gh you have 1 level for merge and another for configuring how the merge is done --rebase. How would the different merge options be exposed in CML?

[0x2b3bfa0]

Probably cml pr --merge for merging, cml pr --rebase-merge / --merge-rebase / --rebase for rebasing and something similar for squashing if we choose to.

[daavoo]

Probably cml pr --merge for merging, cml pr --rebase-merge / --merge-rebase / --rebase for rebasing and something similar for squashing if we choose to.

I kind of like --merge, --rebase, and --squash.

Maybe off-topic but, would it make any sense to have separate command cml merge ?

So: cml merge --rebase $(cml pr "output.txt")?

[0x2b3bfa0]

Yes, in an ideal world (#762) what is now known as cml pr should be cml pr create and it would make sense to have even both cml pr merge and cml pr create --merge

[casperdcl]

love cml {pr,mr} {create [{--merge,--rebase,--squash}],merge,rebase,squash}... updated #762 accordingly. Probably worth collecting similar breaking API changes there for a possible major version bump.

[casperdcl]

also how to handle conflicts (#758)?

[0x2b3bfa0]

See also automatic merge as in gh pr merge --auto and #903 (comment)

[0x2b3bfa0]

Closed with #932; naming suggestions moved to #762 (comment)