How to Resolve Merge Conflicts Between Branches

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

Рет қаралды 1,091

3 ай бұрын

Navigate the complexities of resolving merge conflicts in Git with our practical guide. Ideal for developers who want to maintain a smooth workflow, this tutorial demonstrates step-by-step methods to address and resolve conflicts between branches, ensuring your project's integrity. Enhance your version control skills and keep your collaborations conflict-free.
🤙 WELCOME BACK 🤙
GITKRAKEN: www.gitkraken.com/invite/vQvb...
WEBSITE: www.swiftful-thinking.com
DISCORD: / discord
GITHUB: github.com/SwiftfulThinking/
SAY THANKS: www.buymeacoffee.com/nicksarno
🤙 #KEEPGOING 🤙
01:57 Welcome back!
02:32 What is a merge conflict?
05:32 Resolving a conflict
09:43 Practice resolving conflicts
12:46 Importance of architecture
16:21 Fix merge conflicts
19:01 Wrapping up!

Пікірлер: 12

@worldwidetraveler3730 2 ай бұрын

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 2 ай бұрын

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

@saikrishnapatha4386 2 ай бұрын

sometimes project file gets conflicts that case how to resolve?

@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!😘

@rayhaanalykhan 3 ай бұрын

Thank you ❤

@kdtechniquesofficial6153 Ай бұрын

Awesome.

@tomvenom 3 ай бұрын

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

@SwiftfulThinking 3 ай бұрын

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 3 ай бұрын

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

@SwiftfulThinking 3 ай бұрын

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

@elemento_arts 3 ай бұрын

@@SwiftfulThinking Looking forward to it

@SomewhereNow 15 күн бұрын

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...