Git: Guides and Practical Know-how | Page 2 | mironsoft Blog
Git
-
Apr 9, 2026
Anyone who regularly rebases a long-lived feature branch onto main knows the pattern: the same conflict in the same file keeps coming back on every rebase. git rerere records the resolution once it has been made manually and reapplies it automatically the next time the exact same conflict shows up, with no external tool required.
-
Apr 8, 2026
Committing PSD files, videos, or archives straight into Git needlessly bloats repository size and clone time for the whole team, because Git's delta compression barely works on binary data. Git LFS replaces these files with lightweight pointers and stores the actual content externally, without changing the familiar commit and push workflow at all.
-
Apr 6, 2026
Tags mark release points in the Git history, but only a consistent strategy built on annotated tags, a clear semantic versioning convention, and automated derivation makes them genuinely reliable for CI pipelines and deployment processes.
-
Mar 22, 2026
Git conflicts are no reason to panic once you actually understand PhpStorm's three-way merge dialog. Base, Local and Remote side by side turn a confusing diff into a controllable, line-by-line decision.
-
Mar 8, 2026
A slow CI pipeline is rarely just about the YAML file. How a team branches, commits, and structures pull requests largely determines how efficiently GitHub Actions can operate.
-
Mar 7, 2026
Deployer PHP and GitLab CI/CD complement each other perfectly for Magento deployments: GitLab builds and tests, Deployer takes care of the release structure, the symlink switch and the rollback path. Teams that combine both tools correctly end up with a reproducible, team ready deployment process without maintenance window roulette.
-
Mar 4, 2026
Using Git without a thoughtful configuration means committing with the wrong identity, fighting a messy history, and losing time when switching between projects. The three config scopes system, global, and local follow a clear precedence, letting you set up editor, rebase behavior, aliases, and per-project overrides via includeIf in a clean, predictable way.
-
Mar 4, 2026
When a bug has crept in somewhere among hundreds of commits, manually clicking through history burns valuable time. git bisect finds the guilty commit through binary search in just a handful of steps, whether tested manually or fully automated with a test script, turning hours of hunting into a matter of minutes.
-
Mar 1, 2026
Seeing static analysis and code style checks for the first time in the CI pipeline is too late. PHPStan, Psalm and PHP_CodeSniffer can be integrated directly into PhpStorm, as External Tools, Run Configurations and File Watchers, so feedback arrives the moment you save, not only at the pull request.
-
Feb 28, 2026
Code that is never tested and never analyzed quietly accumulates errors. Bundling PHPUnit, PHPStan, PHPCS and composer audit as parallel GitLab CI jobs delivers feedback after every commit on tests, type safety, style and known security vulnerabilities, automatically and without manual effort.