Alexis Määttä Vinkler

I'm a fly-fishing web developer, entrepreneur and sports freak! I help you, as a software professional, to excel with Git 🤓

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 Featured

The Git Reflog — Your Hidden Lifeline

Did I just delete a month's work? 😱 Just the thought of it probably gives you the creeps. Here's how to recover deleted branches and commits!

Commit

Commits, Branches, and Tags — What You Need to Know!

How commits, branches, and tags interplay, and how to make the most of them.

Git

How Snapshot and Delta Storage Differs

A bank statement analogy exemplified through the lens of Subversion and Git!

Members only

Git Featured

How Git Store Files — a concrete example

Want to know how Git stores files and folders? Check out this concrete step-by-step walkthrough!

Git Featured

How Does Git Store Files?

In this post, I'll show you how project files and folders are stored, and how they relate to the overarching commit history — all from a conceptual point of view.

Git

First master absolute commit referencing...

...then learn its relative counterpart! 🤓 In this post I'll showcase the difference between absolute and relative commit references in Git.

Git Featured

How to Tidy up a Dirty Commit History (squash vs fixup)

Got some unwanted files, changes, or commit messages in your history? Don't worry! In this post I'll show you how to tidy up a dirty commit history.

Git Featured

How to Split Commits and Remove Unwanted Files

Did you perhaps commit that log file or binary by accident? No worries! In this post I'll provide you with three ways to remove unwanted files from a series of commits.

Git

Never Mind the Esoteric Plumbing Commands – Stick to a Subset of the basics!

Git has more than 140 commands available to use, but do you really need them all? In this post I'll highlight which operations to learn by heart, and which to scrap completely!

Git Featured

How to Undo Changes in Git (reset vs revert vs restore)

The need to undo changes during development is commonplace working with Git, but can many times feel daunting. In this post we'll look at three simple ways of undoing changes using reset, revert, and restore.

Git

Stop Treating Git as Your Unwanted Bookkeeping Software

Are your one of those thinking that Git is onerous and interrupts your development flow? This post will change your view and motivate you to deepen your Git knowledge – knowing your efforts will generate true business value!

Git

Does amending a commit change its hash?

As all commits are immutable snapshots, any alterations to their content would change the hash. In more strict terms, amending a commit creates a new commit with the desired changes, leaving the original commit untouched. In this post I'll showcase a typical use-case illustrating this.

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!

Git

Git Commands & Concepts – Demystified (part 2)

Being overwhelmed by Git's commands & concepts is unfortunately not too uncommon. This second post in the small series, aimed at making your life with Git more durable, focuses on managing files locally!

Git

Git Commands & Concepts – Demystified (part 1)

Being overwhelmed by Git's commands & concepts is unfortunately not too uncommon. This post provides a mental model highlighting all key parts, making your life with Git more durable!

Git Featured

Immutable Snapshots – One of Git's Core Concepts 🚀

One of Git's core concepts, that's easily overlooked and sometimes misunderstood, is the fact that all commits are immutable snapshots of the entire project! In this post I'll illustrate what this really means.

Git Featured

What is HEAD in Git?

HEAD answers the question: Where am I right now in the repository? It is a pointer to the currently checked-out branch or commit, which in turn contains an immutable snapshot of your entire code base at a given time.