Git - The Mergify Blog

Git

A collection of 12 posts

What is the difference between a merge commit & a squash?

What is the difference between a merge commit & a squash?

Git and GitHub can be tricky tools to master, but the better you get at using them, the more secure and consistent [https://blog.mergify.com/github-security-best-practices/] your coding work can become. Developers around the world leverage a number of Git and GitHub workflows to streamline their progress. Some of

Git Commit vs Push: What’s the Difference?

Git Commit vs Push: What’s the Difference?

Many coders have used Git at one point or another. In fact, for most, it’s the version control system of choice since it's open-source and easy to use. A common discussion that comes up is Git commit vs push, or more specifically, how the two commands differ. In this

How to Merge Branches to Main in Git

How to Merge Branches to Main in Git

Merging is at the core of the version control system Git's feature set. Git is a powerhouse for pushing code improvements and modifications from a local work environment to a remote production server or public repository. However, completing a seemingly simple merge can quickly become a chore if issues arise.

How to Undo a Merge in Git

How to Undo a Merge in Git

Merging is essential to every developer's workflow in Git. Without merging, your codebase would wither as contributors come up empty-handed when it comes time to mix their work in with what has already been published. Merging makes this all possible [https://blog.mergify.com/a-merge-queue-on-steroids/]. But merging can also make

How to solve Linus Torvalds' issues about GitHub

How to solve Linus Torvalds' issues about GitHub

While Linus Torvalds is well-known for Linux, he's also reputed for not having his tongue in his pocket. He is often complaining loudly about what he thinks is wrong or damageable to the industry. As the creator of Git 15 years ago, it's interesting to hear what he recently stated

What Is a Git Merge Fast Forward?

What Is a Git Merge Fast Forward?

A Git fast forward is an extremely useful and efficient mechanism for harmonizing your project's main branch with changes introduced in a given feature branch. Git makes ample use of fast-forwarding merges behind the scenes, speeding up your development workflow in the process. Fast-forward merges can help keep your commit

How to Resolve a Merge Conflict?

How to Resolve a Merge Conflict?

GitHub makes collaborating with many different people on a single piece of code or software much easier by managing the details involved in version control alongside your project's evolving history. This makes it especially useful for comparing code changes as they come in and sorting out differences between code submissions

Code Review Best Practices

Code Review Best Practices

Adopting the right code review best practices can drastically speed up your review process while also improving the quality of your reviews. Often enough, code reviews can become areas of contention among members of your team, prompting them to become defensive about work they’ve done or changes they may

How To Write Good Commit Messages

How To Write Good Commit Messages

Good commit messages make a big difference in your team's ability to stay on top of changes to your codebase. However, coming up with useful and understandable messages is often easier said than done, especially when you’re hard at work. Luckily, there are a few tricks to getting your

What is a Merge Queue?

What is a Merge Queue?

Do you happen to know the common point between the open-source Node.js and Rust projects, the sporty social network Strava, the e-commerce company Shopify and the ride-hailing company Uber? Their engineering team all rely on a merge queue. Well, if you never heard of such a concept, you might

What's the Best Git Merge Strategy?

What's the Best Git Merge Strategy?

Once developers have completed work on project features and you’ve approved their pull requests [https://blog.mergify.com/what-is-a-pull-request/], it’s time to merge those requests into the main project repository. When doing so, Git has to find a base commit shared by two or more commits and then

Everything You Need to Know About Git Merge

Everything You Need to Know About Git Merge

A fundamental aspect of working on open-source projects is separating bug fixes, feature developments, and similar tasks into separate branches. Doing so lets developers experiment with code solutions free of the worry of messing things up in the main repository. However, these offshoot branches must be merged into the main