Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Xcode Build issues by removing merge conflict leftovers from code #20

Merged
merged 1 commit into from
Jan 24, 2023

Conversation

AmanKAggarwal
Copy link
Collaborator

@AmanKAggarwal AmanKAggarwal commented Jan 24, 2023

Tracking Info

Make sure your branch name conforms to: <feature|staging|bugfix|...>/<username>/<3-4 word description separated by dashes>. Otherwise, please rename your branch and create a new PR.

Looks like when merge conflict was resolved in commit d4bfb5c some lines like main got left in the codebase. This was causing a parse error when opening the project through xcode.

Future note -
Running xcodeproj show ALUM.xcodeproj from terminal gives more details on what kind of error happened because of which XCode is not opening

Changes

What changes did you make?

  • Removed some leftovers from a previous merge conflict resolution

Testing

How did you confirm your changes worked?

  • Ran previews for the existing components on Xcode

Confirmation of Change

image

@AmanKAggarwal
Copy link
Collaborator Author

Example output for xcodeproj show ALUM.xcodeproj

/Library/Ruby/Gems/2.6.0/gems/nanaimo-0.3.0/lib/nanaimo/reader.rb:284:in `raise_parser_error': [!] Array missing ',' in between objects (Nanaimo::Reader::ParseError)
   #  -------------------------------------------
   #  				9752A4EA2978B90F001E0AAB /* TextInputFieldComponent.swift in Sources */,
   #          main
194>  				0748209129712921004AF547 /* ContentView.swift in Sources */,
      				^
   #  				0748208F29712921004AF547 /* ALUMApp.swift in Sources */,
   #  			);
   #  -------------------------------------------
	from /Library/Ruby/Gems/2.6.0/gems/nanaimo-0.3.0/lib/nanaimo/reader.rb:174:in `parse_array'
	from /Library/Ruby/Gems/2.6.0/gems/nanaimo-0.3.0/lib/nanaimo/reader.rb:134:in `parse_object'
	from /Library/Ruby/Gems/2.6.0/gems/nanaimo-0.3.0/lib/nanaimo/reader.rb:193:in `parse_dictionary'
	from /Library/Ruby/Gems/2.6.0/gems/nanaimo-0.3.0/lib/nanaimo/reader.rb:132:in `parse_object'
        ....

@AmanKAggarwal AmanKAggarwal changed the title Remove merge conflict leftovers from code Remove merge conflict leftovers from code to fix xcode build Jan 24, 2023
@AmanKAggarwal AmanKAggarwal changed the title Remove merge conflict leftovers from code to fix xcode build Fix Xcode Build issues by removing merge conflict leftovers from code Jan 24, 2023
Copy link
Contributor

@YashRavipati1 YashRavipati1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@YashRavipati1 YashRavipati1 self-requested a review January 24, 2023 01:46
Copy link
Contributor

@YashRavipati1 YashRavipati1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

Copy link
Contributor

@HarshGurnani HarshGurnani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@AmanKAggarwal AmanKAggarwal merged commit 1f27205 into main Jan 24, 2023
@AmanKAggarwal AmanKAggarwal deleted the bugfix/AmanKAggarwal/fix-xcode-build-issue branch January 25, 2023 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants