Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Guidelines too opinionated about squashing commits on develop #124

Open
arzke opened this issue Jan 31, 2018 · 2 comments
Open

Guidelines too opinionated about squashing commits on develop #124

arzke opened this issue Jan 31, 2018 · 2 comments

Comments

@arzke
Copy link

arzke commented Jan 31, 2018

In 1.2, we can read the following:

You can use --autosquash to squash all your commits to a single commit. Nobody wants many commits for a single feature in develop branch. read more...

I think that asserting that nobody wants that is a fallacy. There are good reasons for which you would want to keep those commits separated even in develop branch:

  • know what the reason of a change was when doing a git blame, which is naturally in the commit message/description and not in the feature
  • having more precision for git bisect: squashing makes you lose information as you only know which feature caused a regression, rather than a specific commit (the latter narrows the scope)

Those are the reasons why I never squash my commits into a feature commit. You should therefore mention in your guidelines that this is subjective.

@vpanjganj
Copy link
Collaborator

Hi @brundozer , I do agree that it is opinionated. I think the aim was to keep the main branch tidy. Many commits provide valuable information within a feature branch only and this is not the case on the main branch when you look at the bigger picture. You can read more about it here. However, your point is valid too. I suggest we rephrase it in a way that provides both pros and cons and the fact that it's up to the developer after all.

@theNaut1lus
Copy link

Hey @vpanjganj, Could I work on this if it is available ?

@vpanjganj vpanjganj self-assigned this Jul 13, 2021
@vpanjganj vpanjganj added this to the Maintenance milestone Jul 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
update-2021
Awaiting triage
Development

No branches or pull requests

3 participants