fix merge with background error and add debug logging#1449
Open
fix merge with background error and add debug logging#1449
Conversation
mrariden
commented
May 7, 2026
Comment on lines
+1308
to
+1310
| if self.selected == self.prev_selected: | ||
| self.logger.debug('Cells are same, skipping merging') | ||
| return |
Collaborator
Author
There was a problem hiding this comment.
Use a guard claude for readability
mrariden
commented
May 7, 2026
Comment on lines
+1311
to
+1314
| if 0 in [self.prev_selected, self.selected]: | ||
| self.logger.debug('Skipping attempted merge with background') | ||
| return | ||
| self.logger.debug(f'Attempting to merge {self.prev_selected} and {self.selected}') |
mrariden
commented
May 7, 2026
| self.logger.debug('Skipping attempted merge with background') | ||
| return | ||
| self.logger.debug(f'Attempting to merge {self.prev_selected} and {self.selected}') | ||
| for z in range(self.NZ): |
Collaborator
Author
There was a problem hiding this comment.
identical block but de-indented because of guard clause
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Previously, it was possible to merge the background (
0) with a cell. This PR makes this impossible by skipping when one of the indices matches the background value of0.