Signal mask refinement with numba

[YoannKermaidic]

No description provided.

[olantwin]

Can you rebase this against main? It includes all the changes from your previous pull request, if I'm not mistaken.

[YoannKermaidic]

Hi Oliver,
Yes I have to rebase... I'll do that tomorrow morning, I have to leave now.

[YoannKermaidic]

@olantwin Now the PR should be fine

[olantwin]

Could you please try to rebase? While there are now no conflicts anymore due to the merge, of the 11 commits, only 2-3 are actually new.

[YoannKermaidic]

@olantwin
I'm not able to "Rebase and merge" - this is currently blocked as "Merging can be performed automatically with 1 approving review. "

[YoannKermaidic]

If I run git rebase upstream/main main on the command line, I get many errors...
Auto-merging settings/analysis_parameters.json
CONFLICT (add/add): Merge conflict in settings/analysis_parameters.json
Auto-merging lardon.py
CONFLICT (content): Merge conflict in lardon.py
Auto-merging analysis_parameters.py
CONFLICT (add/add): Merge conflict in analysis_parameters.py
Failed to merge in the changes.
Patch failed at 0012 Add analysis parameters reader/file

[YoannKermaidic]

Not sure how to solve this:

[olantwin]

@olantwin I'm not able to "Rebase and merge" - this is currently blocked as "Merging can be performed automatically with 1 approving review. "

I meant a local rebase.

[olantwin]

If I run git rebase upstream/main main on the command line, I get many errors... Auto-merging settings/analysis_parameters.json CONFLICT (add/add): Merge conflict in settings/analysis_parameters.json Auto-merging lardon.py CONFLICT (content): Merge conflict in lardon.py Auto-merging analysis_parameters.py CONFLICT (add/add): Merge conflict in analysis_parameters.py Failed to merge in the changes. Patch failed at 0012 Add analysis parameters reader/file

The problem is, I think, that due to the merges git doesn't recognise that a lot of the commits are identical.

[olantwin]

If I run git rebase upstream/main main on the command line, I get many errors... Auto-merging settings/analysis_parameters.json CONFLICT (add/add): Merge conflict in settings/analysis_parameters.json Auto-merging lardon.py CONFLICT (content): Merge conflict in lardon.py Auto-merging analysis_parameters.py CONFLICT (add/add): Merge conflict in analysis_parameters.py Failed to merge in the changes. Patch failed at 0012 Add analysis parameters reader/file

The problem is, I think, that due to the merges git doesn't recognise that a lot of the commits are identical.

You'll probably want to do an interactive rebase and drop all the commits which were already in the other pull-request.

[olantwin]

Not sure how to solve this:

I can git it a try rebasing for you. I'll have to open a new pull request though, as I can't push to your repo. Why don't you work in the dune-lardon one anyway?

[olantwin]

@YoannKermaidic , please have a look at #44

[YoannKermaidic]

I rebased skipping all previous commits. Should work.

[olantwin]

Is still see about 9 commits which are already in main. Did you push the rebased branch?

[olantwin]

Although the merge seems to have taken care of any conflicts.

[YoannKermaidic]

I feel like we can close this PR?