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

Rebase PR for azure based repos #3102

Closed
milind009 opened this issue Feb 9, 2021 · 6 comments
Closed

Rebase PR for azure based repos #3102

milind009 opened this issue Feb 9, 2021 · 6 comments
Labels
T: feature-request Requests for new features V: Azure Devops Issues relating to Azure Devops support

Comments

@milind009
Copy link
Contributor

milind009 commented Feb 9, 2021

We have been running a dependabot like service for azure based repos and create dependency update PRs for repos at regular cadence.
We have been getting feature requests by our customers to add support for automatic resolution of merge conflicts in PR but currently dependabot-core does not support that for azure based repos.
We are actually planning to implement this in our forked dependabot-core repository and contribute back whatever we can to dependabot-core.
I wanted to know if there are any plans to add this support in dependabot-core in the near future so that we can avoid any redundant effort else we are planning to add this feature in the next couple of weeks.

@jurre Can you help us with this?

@milind009 milind009 added the T: feature-request Requests for new features label Feb 9, 2021
@jurre
Copy link
Member

jurre commented Feb 9, 2021

What would such a feature look like? What we do for GitHub, is to re-run the job against the latest head ref. This is not part of dependabot-core, but rather of the services we use to run it. Could you do something similar for Azure? Actual resolution of conflicts seems really hard, but I'm curious to hear your thoughts.

@milind009
Copy link
Contributor Author

We are planning to do something similar for azure. We would be re running the update with the latest head ref and then force push the changes onto the source branch

@jurre
Copy link
Member

jurre commented Feb 9, 2021

Cool, that makes sense 👍 we're not planning to add anything specific to that functionality to core, but I'm curious to hear which bits you think would make sense here.

I'm happy to chat through some of this on zoom/teams if that would be helpful as well, feel free to reach out at jurre github com.

@milind009
Copy link
Contributor Author

We are planning to add the pull request updater implementation for azure client on similar lines as done for github and gitlab currently. I'll open PRs for the code changes that i have made for clarity

@milind009
Copy link
Contributor Author

Created this PR:#3153

@jeffwidman jeffwidman added the V: Azure Devops Issues relating to Azure Devops support label Sep 21, 2022
@jeffwidman
Copy link
Member

Fixed in #3153

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
T: feature-request Requests for new features V: Azure Devops Issues relating to Azure Devops support
Projects
None yet
Development

No branches or pull requests

3 participants