Рет қаралды 8,351
Follow me:
/ dfbastidas
In this video of the git and github PROFESSIONAL course I will teach you WHAT IS AND HOW TO SOLVE a conflict in GIT.
In reality, resolving conflicts is too easy and they happen much more commonly than you might imagine. The world has not ended because you have a conflict in GIT. NO. The solution is simple: Talk to your partner, choose the version you want to keep and do a commit. IN THIS VIDEO I SHOW YOU EVERYTHING.