DM-6718 Add str and repr for afw catalog/record #268
Merged
Conversation
This file contains 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
|
there is no merge commit indicating that 2 of these commits were distinct. |
|
I'm confused by your comment, @timj ? Why would there be such? |
|
Oh. I was confused by the base commit of this PR. Are you merging this branch directly to master or are you merging this branch to 11429 and then merging 11429 to master? I expected the latter. |
|
I think my plan is to merge 11429 to master, then rebase this onto master (which shouldn't change anything), then merge this. But I'm open to suggestions. |
|
That is one option. Doing it in two stages like that is fine with me (so this PR is not itself being merged). |
parejkoj
force-pushed
the
tickets/DM-6718b
branch
from
3cf157e
to
5c8238e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Re-merge, after fixing the variable-length arrays problem in DM-11429.