Rename asset to lkRed to conform to existing usage#26
Open
speakermagnet wants to merge 5 commits intolivekit-examples:mainfrom
Open
Rename asset to lkRed to conform to existing usage#26speakermagnet wants to merge 5 commits intolivekit-examples:mainfrom
speakermagnet wants to merge 5 commits intolivekit-examples:mainfrom
Conversation
…ince git is case insensitive I first need to rename to a different name entirely, commit the changes, then later I will change the name back to the original with the correct capitalization.
… capitalization. This effort was performed to get around the limitation that git on this system (and apparently whoever committed origin) is case-insensitive.
Collaborator
|
Can you resolve the merge conflicts |
Collaborator
|
I also want to include xcworkspace file |
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
2 participants
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.
Motivation: An asset currently being used in
swift-exampleis the colorlkRed. Origin branch included unused assetLKRed.colorsetinAssets.xcassets.Changes made:
LKRed.colorsettolkRed-temp.colorsetthen tolkRed.colorset.Simple case changes via renaming did not trigger case-insensitive git therefore 2 commits were needed.
.gitignoreto avoid local project specific files.Unclear if these changes should also be part of repo to avoid future conflicts
Please review the changes and let me know if any further modifications are required.