Git Tutorial with Python p.4 – Working with Branches
In this video series we are going to cover the basics of Git. And in this video, we will how see three different types of merges while using branches, namely a fast-forward merge, a three-way merge without merge conflict and a three-way merge with merge conflict. We will then also see how to resolve the merge conflict.
Links:
Corresponding blog post (and slides): https://www.sebastian-mantey.com/post...
GitHub repo: https://github.com/SebastianMantey/Gi...
"Git Tutorial" playlist: • Git Tutorial with Python p.1 – Key Concept...