Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set Merge Type For PR Auto-Complete #10

Closed
edgariscoding opened this issue Nov 8, 2019 · 9 comments
Labels

Comments

@edgariscoding
Copy link

@edgariscoding edgariscoding commented Nov 8, 2019

My organization only allows Squash merge types on PRs to our master branch. Currently, if I have this extension auto-complete the PR, I get the following warning:

Project Collection Build Service (My-Company) set the pull request to automatically complete when the following policies succeed:
Merge type: Merge (no fast-forward) is forbidden by policy
Changes will be merged into master. Branch develop will be retained. Work items will be unchanged.

Is there a way we could set the merge type after checking the "set auto-complete" option for the task?

@shayki5

This comment has been minimized.

Copy link
Owner

@shayki5 shayki5 commented Nov 9, 2019

Hi @edgariscoding,
It's a good idea to add this feature!
I will start work on it and I will update you.

Kind regards,
Shayki

@shayki5 shayki5 added the enhancement label Nov 9, 2019
@shayki5

This comment has been minimized.

Copy link
Owner

@shayki5 shayki5 commented Nov 11, 2019

Hi again,

I added this feature :)
Now you can choose a few complete options, include squash merge.
Implemented in PR #11

Kind regards,
Shayki

@shayki5 shayki5 closed this Nov 11, 2019
@edgariscoding

This comment has been minimized.

Copy link
Author

@edgariscoding edgariscoding commented Nov 11, 2019

Wow! That was fast! Thank you!

@shayki5

This comment has been minimized.

Copy link
Owner

@shayki5 shayki5 commented Nov 11, 2019

You're welcome!
Please check it and if it doesn't work let me know.

@edgariscoding

This comment has been minimized.

Copy link
Author

@edgariscoding edgariscoding commented Nov 11, 2019

@shayki5 is there a way to force an update to a task or does it take some time for it to become available from Microsoft? I created a new pipeline and added your extension. The version drop down at the top shows "1.*" and I don't see options for choosing the merge type when enabling auto-complete.

@shayki5

This comment has been minimized.

Copy link
Owner

@shayki5 shayki5 commented Nov 11, 2019

@edgariscoding It should be updated automatically within a few hours, if you not see it you can just uninstall the extension and reinstall.

@edgariscoding

This comment has been minimized.

Copy link
Author

@edgariscoding edgariscoding commented Nov 12, 2019

@shayki5 Just wanted to show that I still don't see these options despite having the latest version of the extension. I create a NEW empty build pipeline, then added the "Create Pull Request" task. Checking the "Set Auto Complete" does not show the options to choose a merge type.

image

image

@shayki5

This comment has been minimized.

Copy link
Owner

@shayki5 shayki5 commented Nov 12, 2019

@edgariscoding It's really wired, it also occurs to me when I published a private version to test it, I think there is a bug, I should report it. what I do each time is uninstall and re-install so I guess it will solve it also in the public version.

@edgariscoding

This comment has been minimized.

Copy link
Author

@edgariscoding edgariscoding commented Nov 12, 2019

@shayki5 Thank you, I guess I could submit a bug report too. I'm not the administrator for our organization so I can't uninstall the extension myself. I'll see if it starts working one of these days.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.