257 whendodepreciation #340
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
|
Hi @labordep Pierre can you have a look at the conflicts. I have no idea how to fix them but we should not keep PR with conflicts open too long. |
|
There are 702 file changed, this is not normal. It seems like all file are re-encoded, @tinchodias what can I do ? |
|
Hi @tinchodias, this problem are due to not using tonel v1 in my image ? |
|
You had v1, it's okay, but the files you changed had v2 or v3 format, that's a root of the problem. After there are other changes in the target branch and produces conflicts. This is what I understand. There was similar issue with an Enzo PR and I had troubles to merge but Pablo did it, I will try with Iceberg. |
tinchodias
approved these changes
Dec 13, 2023
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.
No description provided.