Page 10 - Git

Repository governance, build artifacts, release directories, symlink switching, verify jobs and rollback as one closed, traceable process, with every building block explained in context.

Every switch from editor to browser costs context. With JetBrains Space or the GitLab and GitHub integrations, merge request comments can be answered directly in PhpStorm, diffs reviewed and reviews completed without ever leaving the editor.

If you only use git diff superficially, you quickly miss unwanted changes between the working directory, staging area, and commit. This article shows how to keep the three comparison levels straight, filter precisely with flags like stat, word-diff, and -w, and configure a capable diff tool for everyday use.

Treating merge and rebase as interchangeable risks lost commits, confusing history, and force-push chaos across a team. Both commands integrate diverging branches, but in fundamentally different ways. This article explains the internal mechanics of both operations and delivers a clear, practical decision framework for daily use.

Anyone who only ever runs tests and CLI commands in the terminal loses valuable seconds on every cycle. Run configurations in PhpStorm turn the green play button into a real tool, with a Docker interpreter, Xdebug integration and compound runs for complex workflows.

Git uses the Myers algorithm by default to compute differences between two file versions, but that is far from the only option. Patience diff and histogram diff follow a different approach and often produce noticeably clearer results for moved or reordered code. This article explains how the four algorithms available in Git work internally, where their differences show up in practice, and how to configure the right algorithm permanently.

Anyone who works with Git daily through the command line types certain command combinations dozens of times a day, often with the same options and formatting flags. Git aliases bundle such recurring commands into a single, short command, saving not only keystrokes but also mental overhead, since complex standard workflows no longer need to be reassembled every time. This article covers how simple and advanced aliases work, which ones have proven themselves in practice, and how to distribute them across a team.

Running ten Magento shops with ten identical pipeline files is technical debt in its purest form. Every change to the deploy process has to be made ten times. GitLab templates with include and extends solve this problem: one central build standard, individually extensible per project.

A Magento rollback is more than flipping a symlink. The database, queue messages, static content, and Elasticsearch indexes each follow their own rules. Anyone who rolls back only the files risks inconsistencies that are harder to fix than the original problem.

A careless git reset --hard or a botched rebase feels like a permanent loss, but rarely is. The reflog logs every movement of HEAD locally and makes vanished commits recoverable again within minutes in most cases. This article shows how the reflog works, how long entries survive, and how a clean recovery plays out in practice.