Merge conflicts can be resolved directly within Xcode using Xcode's excellent source control tools. In this video, see how to use Xcode to resolve conflicts created when merging branches.
- [Narrator] Let's take a look at how Xcode can be used…to manage conflicts between branches.…So here I am in the source control navigator…on my master branch.…Note that this commit has been tagged with the tag,…but you can add a tag to a commit…by right-clicking it and choosing tag.…You can then add the tag that you want to add…and then hit create.…Once you've added a tag, you can actually filter for the tag…by typing tag colon and then the name of the tag…like bug, for example.…
We can view commits as sorted by tags if we want to.…You can also add tags to branches…by right-clicking them and then choosing tag as well.…So what we're going to do here to demonstrate our conflicts…is to create a new branch.…So I'll right-click the master branch,…choose branch from master,…and I'll name this bug-fix and then hit create.…Now I'm currently working in the bug-fix branch.…I'll head over to ViewController.swift…and fix our hypothetical bug…by changing this value of a string.…
I'll save this and then I'm going to commit that change.…
- Installing Xcode
- Creating your first project
- Editing code
- Creating snippets
- Prototyping in playgrounds
- Implementing version control with Git
- Building and connecting the interface
- Compiling and debugging apps in Xcode
- Creating workspaces for sharing resources and code
Skill Level Beginner
1. Getting Started
2. Edit Code
3. Source Control
4. Interface Builder Basics
5. Compile and Debug
Create a workspace2m 51s
Next steps1m 5s
- Mark as unwatched
- Mark all as unwatched
Are you sure you want to mark all the videos in this course as unwatched?
This will not affect your course history, your reports, or your certificates of completion for this course.Cancel
Take notes with your new membership!
Type in the entry box, then click Enter to save your note.
1:30Press on any video thumbnail to jump immediately to the timecode shown.
Notes are saved with you account but can also be exported as plain text, MS Word, PDF, Google Doc, or Evernote.