Page 6 - Git

When PHPStan is green locally but red in the CI pipeline, it comes down to a configuration mismatch. The problem is solvable: align pre-commit hooks, PhpStorm quality gates and the CI pipeline so that what runs locally checks exactly what the pipeline checks, no push that fails right out of the gate.

Teams that commit vendor directories or ignore composer.lock risk inconsistent installs between a developer machine, the CI pipeline and the production server. This article explains why composer.lock should be versioned instead of vendor, how private Magento Marketplace packages are wired up safely through auth.json, and how composer.lock merge conflicts between branches get resolved cleanly, so deployments stay reproducible at every stage.

A good code review checks far more than indentation and naming conventions. It catches logic errors, missing test cases, security holes and compatibility problems before they reach production. This article shows how experienced reviewers work through pull requests systematically, give concrete instead of vague feedback, and use Git tools to understand a change's context before commenting.

Without a reviewer, without a team working in parallel, solo developers face a different question than corporate teams do: not how to avoid conflicts between multiple people, but which part of the usual Git process still provides real value and which part is just unnecessary overhead.

A commit template defines how a commit message should be structured, but without technical enforcement it stays a recommendation that gets ignored in daily work. This article shows how a simple .gitmessage file grows into a rule set that actually holds locally, in a hook, and in CI.

Trunk-based development replaces long feature branches with short-lived ones that flow back into the main branch several times a day. Feature flags make it possible to ship unfinished work safely without endangering the application, while a fast, reliable CI pipeline checks every commit for regressions immediately and keeps the main branch permanently releasable.

Blue/Green deployments sound like the perfect zero-downtime solution. For most Magento shops, though, the infrastructure overhead is out of proportion. Symlink releases achieve the same rollback speed at a fraction of the complexity, provided they are set up correctly.

A mirror repository reproduces a Git repository not just in content but in full structure, including every branch, tag, and internal reference. That fits backups, disaster recovery, and migrations between hosting platforms, but it requires a clear understanding of how git push --mirror actually overwrites a target repository.

Switching between feature branches without bringing along the matching database means testing against wrong states or losing fixtures. An automated workflow with database snapshots per branch makes switching as effortless as a plain git checkout.

Monster commits that mix refactoring, bug fixes and new features slow down code review, make git bisect useless and turn reverting a single change into a coin toss. With git add -p, git commit -p and git rebase -i, every change can be split into clearly scoped, atomic commits that stay traceable, testable and safely revertible on their own.