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

remove stale branches #169

Closed
beliaev-maksim opened this issue Sep 2, 2022 · 4 comments
Closed

remove stale branches #169

beliaev-maksim opened this issue Sep 2, 2022 · 4 comments

Comments

@beliaev-maksim
Copy link
Contributor

please remove unused branches. Ideally keep only master
https://github.com/csernazs/pytest-httpserver/branches

For the future auto deleting could be enabled: https://github.com/csernazs/pytest-httpserver/settings

image

@csernazs
Copy link
Owner

csernazs commented Sep 2, 2022

squash merging is already enabled. There are MRs where we want to keep the commits so I wouldn't force it.
I have also removed many branches, and enabled the Automatic delete options. I have some branches which aren't moving forward but I want to keep the contents in case I will have time to work on such as proxy support.

@csernazs csernazs closed this as completed Sep 2, 2022
@beliaev-maksim
Copy link
Contributor Author

@csernazs
basic rule is that each PR should be as small as possible and be self consistent. That leads to the situations that every PR could be and should be squashed.

You can take example of huge projects. CPython, Django, requests, etc

@csernazs
Copy link
Owner

csernazs commented Sep 3, 2022

We have small PRs but I like that PRs to have commits with descriptive commit messages such as in #166.
These PRs should not have been squashed, and I think it makes no sense to split this PR to 3 PRs.

Having one commit per PR is also fine and I have no problems if someone wants to squash the commits also (personally I prefer to tailor my commits in my git before pushing it to PR but YMMV).

@beliaev-maksim
Copy link
Contributor Author

with above mentioned PR I would squash and merge together commit messages.
If commits could be separated as different features, then I would do 3 PRs out of 1.

I just share community standards, but it is up to the project to decide which way to go :)

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

No branches or pull requests

2 participants