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

aztec-sync PRs in noir are building off of old commits resulting in conflicts #4961

Closed
TomAFrench opened this issue Mar 5, 2024 · 0 comments · Fixed by #4969
Closed

aztec-sync PRs in noir are building off of old commits resulting in conflicts #4961

TomAFrench opened this issue Mar 5, 2024 · 0 comments · Fixed by #4969
Assignees
Labels
A-devops Area: Devops. E.g. CI / build systems

Comments

@TomAFrench
Copy link
Member

I merged a sync PR earlier today but a new one has popped up which doesn't reflect that we've already merged the previous one.

See:
noir-lang/noir#4482

Looking at the commit it's built on, it's ignoring all commits into noir master since 27th of Feb.
https://github.com/noir-lang/noir/commits/1e02292918b0c4824d2b5f92b88d621558dbd617/

This results in us getting merge conflicts which we need to fix on every sync.

@TomAFrench TomAFrench added the A-devops Area: Devops. E.g. CI / build systems label Mar 5, 2024
@github-project-automation github-project-automation bot moved this to Todo in A3 Mar 5, 2024
@TomAFrench TomAFrench changed the title aztec-sync PRs in noir are building off of old commits aztec-sync PRs in noir are building off of old commits resulting in conflicts Mar 5, 2024
@github-project-automation github-project-automation bot moved this from Todo to Done in A3 Mar 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-devops Area: Devops. E.g. CI / build systems
Projects
Archived in project
Development

Successfully merging a pull request may close this issue.

2 participants