Skip to content

Support PBXFileSystemSynchronizedRootGroup merges#139

Open
ivoidcat wants to merge 1 commit intoLightricks:mainfrom
ivoidcat:main
Open

Support PBXFileSystemSynchronizedRootGroup merges#139
ivoidcat wants to merge 1 commit intoLightricks:mainfrom
ivoidcat:main

Conversation

@ivoidcat
Copy link

@ivoidcat ivoidcat commented Mar 5, 2026

Summary

  • add handling for PBXFileSystemSynchronizedRootGroup in add_child_to_component
  • support attaching synchronized root groups under PBXNativeTarget.file_system_synchronized_groups
  • allow group handling paths to accept PBXFileSystemSynchronizedRootGroup where appropriate

Test plan

  • Build and install patched gem locally
  • Reproduce merge on a project containing fileSystemSynchronizedGroups
  • Verify conflict resolution no longer fails with unsupported component errors

Handle additions under PBXNativeTarget and group-like containers so Xcode 16 synchronized folder changes no longer fail as unsupported components.
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.

1 participant