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

Copier updates with merge conflicts should fail renovate/artifacts check #31600

Open
rarkins opened this issue Sep 25, 2024 Discussed in #31592 · 0 comments
Open

Copier updates with merge conflicts should fail renovate/artifacts check #31600

rarkins opened this issue Sep 25, 2024 Discussed in #31592 · 0 comments
Labels
manager:copier Related to the "copier" manager priority-4-low Low priority, unlikely to be done unless it becomes important to more people type:feature Feature (new functionality)

Comments

@rarkins
Copy link
Collaborator

rarkins commented Sep 25, 2024

Discussed in #31592

Originally posted by PJ-Schulz September 25, 2024

Tell us more.

A merge conflict can occur during a copier update if a manual change has been made between two versions. I have reproduced this behavior in an example repository. This is the PR Renovate creates: PJ-Schulz/my-renovate-test#3

In this snipped you can see the example merge conflict:

      containers:
      - name: my-app
<<<<<<< before updating
        image: nginx:alpine
=======
        image: nginx:1.27.1
>>>>>>> after updating
        resources:
          limits:

Currently Renovate only writes a comment in the Pull Request. In my opinion, it would be better if there was an artifact update error and the update was interpreted as failed. This way a person can manually resolve the conflict.

@rarkins rarkins added type:feature Feature (new functionality) priority-4-low Low priority, unlikely to be done unless it becomes important to more people manager:copier Related to the "copier" manager labels Sep 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
manager:copier Related to the "copier" manager priority-4-low Low priority, unlikely to be done unless it becomes important to more people type:feature Feature (new functionality)
Projects
None yet
Development

No branches or pull requests

1 participant