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

Jambo Network Weekly Report 14th Aug — 20th Aug

Test your Ballerina Function written for AWS Lambda

Having fun with puppeteer JS

An update from the San Francisco Credibility Working Group

Beginning | How to CTO

How To Develop Fintech Software?

how to develop fintech software

Explore the possibilities with hundreds of domain extensions — {link} -

Creating and Using Dynamic Libraries ( C )

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

Version controlling with Git and GitHub

How to install a coding environment on your Steam Deck

Bitbucket pipelines can be used to automate several operations by simply running a series of…

bitbucket workspace

Multiple git accounts on same machine