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

How Python Pickle works and how to get remote code execution

What is DevOps, It’s Working, Benefits, Tools in Detail

Kafka summit in review — 2021 Europe

Reduce Cost and Increase Productivity with Value Added IT Services from buzinessware — {link} -

“I automated myself out of my job.”

Rancilio Silvia PID + MPC via Raspberry Pi

Understanding Distributed Databases Scalability

No-code or Low-code Apps

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

Dataclasses in Python (when, why, how)

Leverage your Python unit tests with Nox and Docker

Raspberry-Pi: A web server with CI/CD pipeline (Part-2)

Docker image

Clojure and VS Code beginner setup