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

Feature/two fixed transmons qua #250

Merged
merged 30 commits into from
Oct 4, 2024
Merged

Conversation

KevinAVR
Copy link
Contributor

@KevinAVR KevinAVR commented Oct 2, 2024

After two installations. Worked with Hiro on site -- need only merge-and-squash

@KevinAVR KevinAVR requested a review from HiroQM October 2, 2024 16:56
@KevinAVR KevinAVR self-assigned this Oct 2, 2024
@deanpoulos
Copy link
Contributor

deanpoulos commented Oct 3, 2024

Hi guys, great work!

I haven't reviewed the code, but since you worked together on it, would you still like a review?

Regarding the merge conflict here, it looks like the renaming of Two-Flux-Tunable-Transmons --> Two-Flux-Tunable-Coupled-Transmons has caused the latest changes on main to result in conflict perhaps?

I haven't pulled it to check. But, could you please locally:

  1. checkout this branch
  2. do git merge main
  3. resolve merge conflicts (mainly by accepting the latest from main)
  4. push
    ?

@HiroQM HiroQM closed this Oct 3, 2024
@HiroQM HiroQM reopened this Oct 3, 2024
@HiroQM
Copy link
Contributor

HiroQM commented Oct 4, 2024

Resolved the merge and pushed. LGTM!

Copy link
Contributor

@HiroQM HiroQM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@HiroQM HiroQM merged commit f49327c into main Oct 4, 2024
1 check passed
@HiroQM HiroQM deleted the feature/two-fixed-transmons-qua branch October 4, 2024 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants