[Feature Request] az repos policy merge-strategy create --use-basic-merge --use-rebase-and-fast-forward --use-rebase-with-merge-commit

Is your feature request related to a problem? Please describe.

The web UI of Azure DevOps allows to permit 4 merge strategies in repository branch policies:

• basic merge
• squash merge
• rebase and fast-forward
• rebase with merge commit

The azure-devops-cli-extension only supports configuring squash merges through az repos policy merge-strategy create --use-squash-merge.

Describe the solution you’d like

az repos policy merge-strategy create understands the additional arguments --use-basic-merge, --use-rebase-and-fast-forward and --use-rebase-with-merge-commit

[atbagga]

How the API used to work. (This is how the command works today):

1. –use-squash-merge is set to False:
2. –use-squash-merge is set to True:

Suggested changes to command to work with newer merge types-

1. –use-squash-merge becomes a deprecated option to be removed in the future and keeps working as it does stated above.

2. Add 4 new merge policy options -

New command keeps working for older scripts as it used to. For newer use the command will list the option --use-squash-merge as deprecated. It will allow the users to use the newer merge options in any combination as required in both create and update command.

[fdcds]

@fdcds Release got delayed for a bit, but the new version is out now. Give it a try and share any feedback if you have.

Appears to work. Thanks!