How to Resolve Merge Conflicts Between Branches | Git & Source Control #7

[@worldwidetraveler3730]

Yes, I am still excited 🎉 seriously, this is great stuff. I love how you structured the course… really very rare to see a Git course with that level of clarity! You truly didn’t fall short or my already very high expectations

[@SwiftfulThinking]

Thanks 😁 I hope you enjoy the ending! (Last video is the best 🤙)

[@alisampson6639]

Hi sir, can you please make a short video differentiating Pull & Fetch in Version Control System

[@NotElonMuskk]

If AI is truly revolutionary, it should be able to understand context and intent by merging and resolving conflicts with the click of a button. Unless I've been misinformed just how smart AI is...

[@saikrishnapatha4386]

sometimes project file gets conflicts that case how to resolve?

[@kavinda_dilshan_paramsoodi]

Awesome.

[@rayhaanalykhan]

Thank you ❤

[@awu878]

Love this video! But sometime I realized that if some teammate adding new files, new folders, or move files around could cause project.pbxproj file has many conflicts, and just accept both sides contents will cause the missing file(file still there, just not shown) or even can't open the project. I haven't find a good way to solve this problem along learning, do you know if there is a good way to solve this? Really hope to see a video about this! Love the video, thank you so much!😘

[@tomvenom]

Hello. Great lessons!!! Are you going to make UIKit course? Despite of being old it’s used for many projects

[@SwiftfulThinking]

Hello, no UIKit courses planned at the moment. There are many channels which have already covered UIKit basics. If I was learning Swift today, I personally would not spent time learning it, which is why I don’t want to steer people in the wrong direction

[@elemento_arts]

Good morning Nick. Would you recommend using branches when working by yourself? Thanks

[@SwiftfulThinking]

Yes, the final video in this series is “Git Flow” which is the branching strategy I would recommend for all projects

[@elemento_arts]

@@SwiftfulThinking Looking forward to it