Comparison of Merging Strategies in GitHub

History is immutable

Avoids introducing commits that break CI

Keeps a linear commit history

Is easier for git beginners

Easily link back to the Pull Request

Avoids “code cleanup” style commits

Merge conflicts are easier to deal with

Can edit the message at merge time

Avoids suppressing tags

--

--

--

I’m a data nerd and TDD enthusiast originally from Sydney. Currently working for Uber in New York. My thoughts here are my own. 🤓 elliotchance@gmail.com

Love podcasts or audiobooks? Learn on the go with our new app.

Recommended from Medium

Distributed System Design Patterns

Modular Architecture with Android Gradle Plugin 3.0

042022 TIL use API with Python

Detailed Examples of SQLite WHERE Clause

The next big thing from the team at Rivet

How to Create a DynamoDB Table with the AWS Console

Lucky Block Spiral Mod for Minecraft — 150 or so new drops — Wminecraft.net

BhagavadGita.io | Bhagavad Gita — Simplified. (Media Kit)

Get the Medium app

A button that says 'Download on the App Store', and if clicked it will lead you to the iOS App store
A button that says 'Get it on, Google Play', and if clicked it will lead you to the Google Play store
Elliot Chance

Elliot Chance

I’m a data nerd and TDD enthusiast originally from Sydney. Currently working for Uber in New York. My thoughts here are my own. 🤓 elliotchance@gmail.com

More from Medium

Would You Please Just Increase The Memory?

Go Basics

What happens when you type google.com in your browser and press Enter

Go for REST API development