Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Don't squash the commits into master #22081

Closed
1 task done
aminya opened this issue Mar 24, 2021 · 2 comments
Closed
1 task done

Don't squash the commits into master #22081

aminya opened this issue Mar 24, 2021 · 2 comments
Labels

Comments

@aminya
Copy link
Contributor

aminya commented Mar 24, 2021

Prerequisites

Prerequisites

Description

Please don't squash the changes into the master branch. The Electron upgrade had 48 commits which could be used to track the issues of the change, but because it is squashed there is no way to see what issue comes from which change and you remove the logic behind the changes. Also, electron-upgrade-9.3.5 branch is removed which makes the situation worse. Many of the changes of this PR could be merged directly to master separately without the need for bumping Electron.

#21777

Also, people are used to assessing the life of a project based on the commits pushed to the master. When you squash 48 commits into 1, you simply make this huge change one commit.

Looking at this graph, no way you can guess that such a huge change has happened at this point!
image

In #22080, we were interested in testing the changes against a stable version of Atom, but this huge commit has changed many things in the tests making it unreliable to develop features/fixes against.

Expected behavior:

Merge commits normally:

Actual behavior:

Commits are squashed and the branch is deleted.

Reproduces how often:

100%

@sadick254
Copy link
Contributor

It has been resolved internally that going forward we will continue merging commits normally. Without squashing. 👍

@aminya
Copy link
Contributor Author

aminya commented Apr 1, 2021

Thank you!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

No branches or pull requests

2 participants