Xcode allows you to create branches of your Git projects directly from the Xcode interface. Your can also merge those branches with ease. See the process of creating and merging branches in this video.
- [Narrator] Xcode also allows you to create branches…and to merge those branches.…You can do that through the source control navigator.…If you go to the source control navigator,…you'll notice that we only have…one branch for our repository,…and it's the master branch.…Let's say you wanted to add a feature in a separate branch.…To do that, right-click the master branch…and choose branch from master.…Now what we have to do is give the branch a name.…We'll call this add-vars and then hit return or create.…
Now it says the current branch is the add-vars branch.…Create a variable or a constant.…Alright, that looks good.…We'll save the file, and then we're going to commit it.…So source control, commit, or option + command + C.…Select your file, look at the comparison,…and then add the commit text.…
Push it to remote and note that…we see our new branch that we created here.…We also have that other branch…if we want to push to master instead.…Commit the file,…and we successfully pushed into our new branch,…Again, we can confirm that by going into Safari.…
Author
Released
1/29/2019- 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
Duration
Views
Related Courses
-
Swift 5 Essential Training
with Harrison Ferrone4h 3m Beginner
-
Introduction
-
1. Getting Started
-
Install Xcode41s
-
Explore the user interface4m 21s
-
Use tabs52s
-
Open files quickly1m 6s
-
View the Xcode documentation1m 20s
-
Groups and folder references4m 11s
-
-
2. Edit Code
-
Custom documentation2m 54s
-
Create snippets2m 11s
-
Use the Symbol Navigator1m 44s
-
Prototype in a playground2m 46s
-
3. Source Control
-
Commit and push changes3m 50s
-
Branches and merging2m 52s
-
Using the version editor2m 38s
-
Resolve merge conflicts4m 28s
-
Clone a branch59s
-
4. Interface Builder Basics
-
Explore Interface Builder3m 59s
-
Use the Inspector3m 33s
-
Understanding pinning5m 17s
-
Refine pins3m 37s
-
Import and use images3m 46s
-
-
5. Compile and Debug
-
Work with schemes3m 32s
-
Use behaviors1m 46s
-
Use the debugger3m 42s
-
Work with breakpoints4m 21s
-
Refactor code1m 51s
-
Create unit tests5m 1s
-
-
6. Workspaces
-
Create a workspace2m 51s
-
-
Conclusion
-
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.
CancelTake 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.
Share this video
Embed this video
Video: Branches and merging