Prowid course material: https://kurslar.prowid.com/en/index.php?id=lesson&m=366
Git & GitHub course · Branches, Merging and Conflicts
Conflict Tools: VS Code, mergetool, ours/theirs
🔒 This is the beginning of the lesson. The full lesson is available with a subscription.
