merge Featured Differences Between Git Merge and Rebase — and Why You Should Care A comparison of git merge and rebase commands and when to use them!
Members only merge Featured Resolve Merge Conflicts Like a Pro (using VSCode) Merge conflicts are part of the game. Learn how to resolve conflicts like a pro using VSCode!
Git The Magic of 3-Way Merge What a three-way merge is and how Git uses it to resolve conflicts automatically for you.
Members only Git Git Commands & Concepts – Demystified (part 3) Being overwhelmed by Git's commands & concepts is unfortunately not too uncommon. This final post in the small series, aimed at making your life with Git more durable, focuses on branch manipulation!
