Basic Knowledge
Why Git Conflicts Happen (And Why You Should Care) Git conflicts are a common part of software development, especially when teams collaborate. They occur when multiple developers modify the same parts of a codebase, creating a merge conflict because Git can't automatically decide which changes should be prioritized.
Technical
A few weeks ago, something broke in production. No big deal — we've all been there. I did what I’ve done hundreds of times before: Checked logs, wrote a patch, pushed to a new branch, and waited for CI. Except CI failed. Not because of my change, but
Basic Knowledge
Mastering Pytest Parametrize Fundamentals The pytest parametrize feature has become essential for effective Python testing. It allows developers to execute the same test logic with various input values using the @pytest.mark.parametrize decorator. This eliminates redundant code and transforms repetitive test suites into streamlined, maintainable code, a significant improvement
A few weeks ago, something broke in production. No big deal — we've all been there. I did what I’ve done hundreds of times before: Checked logs, wrote a patch, pushed to a new branch, and waited for CI. Except CI failed. Not because of my change, but
At Mergify, we’re growing. That means we’re hiring. And hiring means rejecting candidates—sometimes, a lot of them. It’s one of our hiring process's hardest and most uncomfortable parts. But it’s also one of the most important. Here’s how we do it, why
At Mergify, we merge more than 1M pull requests every year on behalf of our users. That’s not a brag about volume. That’s a statement of purpose. Because behind every single one of those pull requests, there’s one simple promise we’re keeping: 👉 Your CI will never
Python is a fantastic language for writing elegant and flexible wrappers around functions and classes. Wrapping functions is a common practice in software engineering—whether you’re abstracting a third-party library, simplifying a complex API, or just reducing boilerplate. However, blindly wrapping functions without proper type annotations is a dangerous
As we step into 2025, it’s time to reflect on an eventful and transformative 2024 at Mergify. It was a year filled with challenges, growth, and exciting new opportunities to better serve developers worldwide. Here's a look back at what we achieved, what we learned, and what&
In our previous post, we shared how Mergify transitioned from traditional Agile practices to a lightweight, culture-driven workflow that aligned with our values. While this approach served us well in the early days, we eventually realized that to scale effectively and maintain a sense of accomplishment, we needed to introduce
Writing about continuous merge, software development, CI/CD and technical topics.
The Pytest Mock Advantage: Why Smart Developers Use It Behind every dependable Python application lies a solid testing strategy. A core element of this strategy is effective dependency isolation, and that's where pytest mock excels. The pytest-mock plugin offers a streamlined method for mocking objects and functions, simplifying
The Power of Python Fixtures: Transform Your Testing Approach Tired of repetitive test setups and tests that break easily? Many developers grapple with these common testing issues, impacting code quality and project timelines. Python fixtures, however, provide a robust solution for improving your testing approach and building more resilient, maintainable
The Power of Python Test Fixtures: Beyond Basic Testing Python test fixtures offer a powerful way to elevate your testing from simple verification to a robust and maintainable quality assurance process. They take the often tedious setup and teardown routines and transform them into streamlined dependency injection systems. This simplifies
Demystifying Python Fixtures: The Secret to Testing Success Python fixtures are essential for writing efficient and reliable tests. They provide a structured way to manage the setup and teardown phases, ensuring consistency and reducing code duplication. This leads to more maintainable and easier-to-debug tests. Think of fixtures like preparing a
The Fixture Pytest Revolution: Why Developers Are Switching Fixture pytest has become a true game-changer for Python testing. This approach replaces traditional setup and teardown methods, providing a more robust and efficient way to manage test resources. It represents a significant shift in how developers prepare their test environments. But
Demystifying Pytest Parametrize Fixtures: Core Concepts Pytest, a popular Python testing framework, offers powerful features like fixtures and parametrization to boost testing efficiency. Fixtures provide a way to manage reusable test resources. Parametrization, on the other hand, allows you to run the same test with different inputs. Combining these two
Streamlining Your Workflow: Choosing the Right GitHub Merge Strategy Efficient GitHub merge strategies are crucial for streamlined development. Choosing the right strategy improves code history, simplifies debugging, and optimizes CI/CD pipelines. This listicle explores six key GitHub merge strategies: Merge Commit, Squash Merging, Rebase and Merge, Fast-Forward Merge, Cherry-Pick,
Supercharge Your Dev Team's Productivity A great developer experience (DX) means happier, more productive engineers, faster releases, and better code. This listicle presents seven key strategies to improve developer experience, boosting both individual and team performance. Learn how to optimize the inner loop, improve documentation, leverage powerful tooling,
Level Up Your Git Game: Rebase vs. Merge Explained This listicle provides six key insights into the "rebase git vs merge" debate, helping you choose the right command for your needs. Mastering these commands is critical for a clean and efficient Git workflow. You'll learn the
Why GitHub Merge Queue Is Changing How Teams Work If you work on a busy software project, you've probably experienced the "merge race." This happens when multiple developers finish their work around the same time, all trying to merge their pull requests (PRs) into the main
Demystifying What Is a CI Server At its heart, a CI server (which stands for Continuous Integration server) is like a dedicated helper robot for software development teams. Think of it as the central point that automatically handles the job of blending code changes from different developers into one shared
The Reality of Developer Productivity Today The software development world moves quickly. Innovation and rapid delivery are constant demands. This puts a lot of pressure on developers to be highly productive. However, how do we measure that productivity? Traditional metrics, like lines of code or number of bugs fixed, often
