3. Source Control: Branching and Merging with Xcode
Stewart Lynch Stewart Lynch
19.3K subscribers
1,823 views
0

 Published On Jan 21, 2024

This is the third video in the Source Control with Xcode series. In this video we will look at the process of creating a development branch so we can work on our code without jeopardizing our main branch and then merging that branch back to the main branch once we are done.

We will also look at using a git terminal command to reset the head to a previous commit without losing changes and CherryPicking a commit from another branch.

If you want to support my work, you can buy me a coffee :)
https://ko-fi.com/stewartlynch

******* Download my StewartLynch YouTube Channel Application - Free **********
https://stewartlynch.gumroad.com/l/obsjz

Table of Contents:
0:00 Introduction
0:45 Branching and Merging
8:25 In Progress Commits
13:25 Previewing Changes
16:00 Git Reset and Merge
21:08 Other Actions

Starter Project Files:
None

Completed Project:
None

References mentioned in video:
Quick Help video
   • Quick Help Documentation  

All Video in this series
Playlist URL:    • Source Control With Xcode  

1. Git Introduction and initialization:
2. Staging and Committing
3. Branching and merging
4. Remote Repositories and GitHub
5. GitIgnore
6. Forking, Issues and Pull Requests
7. GitHub Desktop and other Git Desktop Clients

Recommended Resources:
RocketSim - Build Apps Faster
https://gumroad.com/a/122988499/ftvbh

BigMountain Studio Books
SwiftUI Views Mastery
https://www.bigmountainstudio.com/vie...
SwiftUI 5 Book Bundle
https://www.bigmountainstudio.com/boo...
Combine Mastery in SwiftUI
https://www.bigmountainstudio.com/com...
Core Data Mastery in SwiftUI
https://www.bigmountainstudio.com/cor...
SwiftUI Animations Mastery
https://www.bigmountainstudio.com/ani...

AppCoda Books
Beginning iOS 16 Programming with Swift (SwiftUI + UIKit)
https://gumroad.com/a/646790611/WihuX
Beginning iOS 16 Programming with Swift (SwiftUI + UIKit) - Starter
https://gumroad.com/a/646790611/mOzKq
Mastering SwiftUI 4 + Swift Programming for iOS 16 - Professional
https://gumroad.com/a/646790611/gjPBw
Mastering SwiftUI 4 - Starter
https://gumroad.com/a/646790611/TyNEz

Other References:
Stewart Lynch's YouTube Channel:
   / @stewartlynch  
Stewart Lynch on Mastodon:
https://iosdev.space/@StewartLynch
Stewart Lynch On Threads:
@StewartLynch
Stewart Lynch on X:
https://x.com/StewartLynch
Stewart Lynch on LinkedIn
  / stewartlynch  

show more

Share/Embed