Information Technology Reference
In-Depth Information
FIGURE 14.17
Although it's not obvious from this dialog box, selecting a branch loads its files into the main editor.
Every difference in every file is highlighted. The gutter area includes a switch icon. You can use the switch but-
tons at the bottom of the window to select the differences. The switches are on by default, but you can turn
them off to exclude a change. You can also use the switches to resolve conflicts.
Note that you can't toggle the switches by clicking them directly in the gutter. You can only change their state
by clicking the button bar at the bottom of the window.
CAUTION
At the time of writing, merging isn't working correctly but is likely to be fixed soon. As a workaround, you can use
Git's command-line merge option. For details see the Git manual. A link is listed near the end of this chapter.
Using Xcode with GitHub
Although it's possible to create a custom remote server for use with Git, the GitHub website at github.org
shown in Figure 14.18, has become a popular choice for development teams and solo developers who use Git.
In theory, the differences between local and remote development should be minor, because Git handles both
situations in a similar way. In practice, remote development requires significant extra effort when creating a new
project.
FIGURE 14.18
Search WWH ::




Custom Search