Combining code changes in a source control repository
Integrate code changes from multiple sources and resolve conflicts between different versions of code using source control tools in Xcode.
Overview
If you use source control to work on code with collaborators or to manage multiple versions of your Xcode project for different releases, eventually, you need to sync code changes between versions. Git source control provides a mechanism for combining sets of code changes by merging those changes together, and Xcode provides a visual interface for performing a merge.
[Image]
Merge code changes
After you complete work in a feature or bug fix branch, you merge your changes into your main development or production branch. Alternatively, you merge other updates from your main development or production branch into your feature or bug fix branch to resolve conflicts or to sync your work with the latest updates and ensure everything functions appropriately before merging back into your main development or production branch.
Open the Source Control navigator and select Repositories.
In the Repositories navigator, expand your repository and the Branches or Remotes folder.
To make the branch you want to merge into the current branch, Control-click it and choose Switch.
Control-click the branch you want to merge from and choose “Merge [from branch] into [to branch]”.
If there are no conflicts, Xcode completes the merge.
Resolve conflicts with other code
In a source control repository, a conflict occurs when two commits have incompatible changes and Git can’t merge the changes automatically. For example, a conflict might occur when two developers change the same lines in the same source file.
If there are conflicts when you attempt to merge changes in Xcode, Xcode presents a comparison view for you to review and resolve the conflicts.
[Image]
To resolve a conflict, click the question mark (?) for that conflict (that appears in the gutter between the left and right versions of the file) and select which option you want to use to resolve it:
Choose Left
Choose Right
Choose Left Then Right
Choose Right Then Left
After you choose a resolution for each conflict, Xcode enables the Merge button. Click the Merge button to complete the merge, or click Cancel to abort the merge and restore your branch so you can make more changes before merging.