search

Exopy / exopy_hqc_legacy

Transition package to smooth transition from HQCMeas to Exopy.
BSD 3-Clause "New" or "Revised" License
0 stars 9 forks source link

Fieldsource exopy #46

Closed lcontami closed 6 years ago

lcontami commented 6 years ago

Since the name of the project changed the branch yet-another-cs4-g4-update was a mess. This is my try at still merging it.

lcontami commented 6 years ago

This was FOR SURE the most painful way to do it

rassouly commented 6 years ago

Your merge doesn't work, for example, you forgot to include commit 05d809cb232e6405d60f1ca57b7a77eb80369dbd (this commit added InstrJob which you include in 3 files). I think you should maybe try to rebase the yet-another-cs4-cg4-update branch onto master instead of continuing with this PR.

MatthieuDartiailh commented 6 years ago

Closing in favor of #47. I would say that the "easiest" way to deal with that kind of situations is by cherry-picking the required commits on top of the master branch. Then one can fix the remaining issues. Merging and rebasing all around can open an avenue of issues.