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.

Sign up for GitHub

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

Jump to bottom

Merged AddRe, MulRe, AddI and MulI into Add and Mul #3812

Merged
merged 17 commits into from
Jun 20, 2024
Merged

Merged AddRe, MulRe, AddI and MulI into Add and Mul #3812

merged 17 commits into from
Jun 20, 2024

Conversation

NoahCardoso
Copy link
Collaborator

Closes #3153

@NoahCardoso NoahCardoso requested a review from balacij June 18, 2024 20:34
@balacij
Copy link
Collaborator

balacij commented Jun 19, 2024

Sorry, I noticed that this is a different branch than the source of #3794. Can you explain what the differences are? Can we delete the previous branch, the one used for #3794 ?

@NoahCardoso
Copy link
Collaborator Author

NoahCardoso commented Jun 19, 2024 •
edited
Loading

The other branch had 40 merge conflicts with the main branch and I didn't know which commits to keep. It was easier for me to cherry-pick my commits onto a new branch that was based on the current version of main. #3794 can be deleted.

@JacquesCarette JacquesCarette merged commit 45fb986 into main Jun 20, 2024
5 checks passed
@JacquesCarette JacquesCarette deleted the mergeAddMul branch June 20, 2024 09:16
samm82 added a commit to samm82/Drasil that referenced this pull request Jun 28, 2024
@samm82
Remove mulRe from chemCode (see JacquesCarette#3812)
0e06deb
samm82 added a commit to samm82/Drasil that referenced this pull request Jun 28, 2024
@samm82
Merge branch 'chemCode' into srsHacks
f9df151 
Remove mulRe from chemCode (see JacquesCarette#3812)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JacquesCarette JacquesCarette JacquesCarette approved these changes

@cd155 cd155 Awaiting requested review from cd155 cd155 is a code owner

@samm82 samm82 Awaiting requested review from samm82 samm82 is a code owner

@bmaclach bmaclach Awaiting requested review from bmaclach bmaclach is a code owner

@balacij balacij Awaiting requested review from balacij

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Merge addRe and addI, and mulI and mulRe
3 participants
@NoahCardoso @balacij @JacquesCarette