Component Translated Untranslated Untranslated words Untranslated characters Checks Suggestions Comments
Item This component is linked to the Cubica/UI repository. Fix this component to clear its alerts. This translation is locked. 48% 1,037 3,832 21,589 772 0 0
Skill This component is linked to the Cubica/UI repository. Fix this component to clear its alerts. This translation is locked. 76% 154 573 3,474 95 0 0
Skin This component is linked to the Cubica/UI repository. Fix this component to clear its alerts. This translation is locked. 45% 891 2,306 13,517 784 0 0
UI Fix this component to clear its alerts. This translation is locked. 79% 346 1,178 6,626 430 0 0
Glossary Cubica 0 0 0 0 0 0

Overview

Project website www.cubica.net

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 5,996 19,250 110,000
Source 1,332 4,203 24,072
Translated 59% 3,568 59% 11,361 58% 64,794
Needs editing 40% 2,428 40% 7,889 41% 45,206
Failing checks 34% 2,081 39% 7,580 39% 43,189
Strings with suggestions 0% 0 0% 0 0% 0
Not translated strings 0% 0 0% 0 0% 0

Quick numbers

19,250
Hosted words
5,996
Hosted strings
59%
Translated
1
Contributors
and previous 30 days

Trends of last 30 days

Hosted words
Hosted strings
Translated
Contributors
Language Translated Untranslated Untranslated words Untranslated characters Checks Suggestions Comments
English This translation is used for source strings. Some of the components within this project have alerts. 0 0 0 475 0 0
Czech Some of the components within this project have alerts. 998 strings are not being translated here. 7% 308 1,143 6,419 160 0 0
Portuguese (Brazil) Some of the components within this project have alerts. 998 strings are not being translated here. 10% 299 1,105 6,209 167 0 0
Russian Some of the components within this project have alerts. 70% 394 1,060 6,235 272 0 0
Spanish Some of the components within this project have alerts. 14% 1,141 3,722 21,398 789 0 0
Vietnamese Some of the components within this project have alerts. 78% 286 859 4,945 218 0 0
User avatar None

New alert

Cubica / UI

Broken project website URL 30 minutes ago
User avatar None

Failed merge on repository

Cubica / UI

Auto-merging Packages/packages-lock.json
CONFLICT (content): Merge conflict in Packages/packages-lock.json
Auto-merging Packages/manifest.json
CONFLICT (content): Merge conflict in Packages/manifest.json
CONFLICT (modify/delete): Assets/Mindblocks/Music/MusicTest.cs deleted in main and modified in HEAD. Version HEAD of Assets/Mindblocks/Music/MusicTest.cs left in tree.
CONFLICT (modify/delete): Assets/Mindblocks/Music/MidiSongInfo.cs deleted in HEAD and modified in main. Version main of Assets/Mindblocks/Music/MidiSongInfo.cs left in tree.
Auto-merging Assets/Mindblocks/Music/Jukebox.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Jukebox.cs
Auto-merging Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/DefaultObject.asset in main. Version main of Assets/AddressableAssetsData/DefaultObject.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/MidisTest.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta in main. Version main of Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis.meta deleted in HEAD and renamed to Assets/AddressableAssetsData.meta in main. Version main of Assets/AddressableAssetsData.meta left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 8678 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
 (1)
6 days ago
User avatar None

Received repository notification

Cubica / UI

GitHub: https://github.com/Mindblocks3/Cubica, main 6 days ago
User avatar None

Failed merge on repository

Cubica / UI

Auto-merging Packages/packages-lock.json
CONFLICT (content): Merge conflict in Packages/packages-lock.json
Auto-merging Packages/manifest.json
CONFLICT (content): Merge conflict in Packages/manifest.json
CONFLICT (modify/delete): Assets/Mindblocks/Music/MusicTest.cs deleted in main and modified in HEAD. Version HEAD of Assets/Mindblocks/Music/MusicTest.cs left in tree.
CONFLICT (modify/delete): Assets/Mindblocks/Music/MidiSongInfo.cs deleted in HEAD and modified in main. Version main of Assets/Mindblocks/Music/MidiSongInfo.cs left in tree.
Auto-merging Assets/Mindblocks/Music/Jukebox.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Jukebox.cs
Auto-merging Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/DefaultObject.asset in main. Version main of Assets/AddressableAssetsData/DefaultObject.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/MidisTest.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta in main. Version main of Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis.meta deleted in HEAD and renamed to Assets/AddressableAssetsData.meta in main. Version main of Assets/AddressableAssetsData.meta left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 8678 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
 (1)
a week ago
User avatar None

Received repository notification

Cubica / UI

GitHub: https://github.com/Mindblocks3/Cubica, main a week ago
User avatar None

Failed merge on repository

Cubica / UI

Auto-merging Packages/packages-lock.json
CONFLICT (content): Merge conflict in Packages/packages-lock.json
Auto-merging Packages/manifest.json
CONFLICT (content): Merge conflict in Packages/manifest.json
CONFLICT (modify/delete): Assets/Mindblocks/Music/MusicTest.cs deleted in main and modified in HEAD. Version HEAD of Assets/Mindblocks/Music/MusicTest.cs left in tree.
CONFLICT (modify/delete): Assets/Mindblocks/Music/MidiSongInfo.cs deleted in HEAD and modified in main. Version main of Assets/Mindblocks/Music/MidiSongInfo.cs left in tree.
Auto-merging Assets/Mindblocks/Music/Jukebox.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Jukebox.cs
Auto-merging Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/DefaultObject.asset in main. Version main of Assets/AddressableAssetsData/DefaultObject.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/MidisTest.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta in main. Version main of Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis.meta deleted in HEAD and renamed to Assets/AddressableAssetsData.meta in main. Version main of Assets/AddressableAssetsData.meta left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 8678 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
 (1)
a week ago
User avatar None

Received repository notification

Cubica / UI

GitHub: https://github.com/Mindblocks3/Cubica, main a week ago
User avatar None

Failed merge on repository

Cubica / UI

Auto-merging Packages/packages-lock.json
CONFLICT (content): Merge conflict in Packages/packages-lock.json
Auto-merging Packages/manifest.json
CONFLICT (content): Merge conflict in Packages/manifest.json
CONFLICT (modify/delete): Assets/Mindblocks/Music/MusicTest.cs deleted in main and modified in HEAD. Version HEAD of Assets/Mindblocks/Music/MusicTest.cs left in tree.
CONFLICT (modify/delete): Assets/Mindblocks/Music/MidiSongInfo.cs deleted in HEAD and modified in main. Version main of Assets/Mindblocks/Music/MidiSongInfo.cs left in tree.
Auto-merging Assets/Mindblocks/Music/Jukebox.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Jukebox.cs
Auto-merging Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/DefaultObject.asset in main. Version main of Assets/AddressableAssetsData/DefaultObject.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/MidisTest.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta in main. Version main of Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis.meta deleted in HEAD and renamed to Assets/AddressableAssetsData.meta in main. Version main of Assets/AddressableAssetsData.meta left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 8678 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
 (1)
a week ago
User avatar None

Received repository notification

Cubica / UI

GitHub: https://github.com/Mindblocks3/Cubica, main a week ago
User avatar None

Failed merge on repository

Cubica / UI

Auto-merging Packages/packages-lock.json
CONFLICT (content): Merge conflict in Packages/packages-lock.json
Auto-merging Packages/manifest.json
CONFLICT (content): Merge conflict in Packages/manifest.json
CONFLICT (modify/delete): Assets/Mindblocks/Music/MusicTest.cs deleted in main and modified in HEAD. Version HEAD of Assets/Mindblocks/Music/MusicTest.cs left in tree.
CONFLICT (modify/delete): Assets/Mindblocks/Music/MidiSongInfo.cs deleted in HEAD and modified in main. Version main of Assets/Mindblocks/Music/MidiSongInfo.cs left in tree.
Auto-merging Assets/Mindblocks/Music/Jukebox.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Jukebox.cs
Auto-merging Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/DefaultObject.asset in main. Version main of Assets/AddressableAssetsData/DefaultObject.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/MidisTest.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta in main. Version main of Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis.meta deleted in HEAD and renamed to Assets/AddressableAssetsData.meta in main. Version main of Assets/AddressableAssetsData.meta left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 8678 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
 (1)
a week ago
Browse all project changes