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

Tidier git history using squash merge #93

Closed
weiji14 opened this issue Jun 26, 2020 · 1 comment
Closed

Tidier git history using squash merge #93

weiji14 opened this issue Jun 26, 2020 · 1 comment

Comments

@weiji14
Copy link
Member

weiji14 commented Jun 26, 2020

Awesome to see so many new contributors joining icepyx! I'm sure we'll all get some great science done, but if I could make one small request - which is to keep the git history nice looking going forward. This is what the graph looks like at the moment:

Icepyx git history graph

It's fine to do merge commits when it's just one or two people working on a repository, but bigger projects with tens if not hundreds of contributors use squash merge commits. This keeps the git history linear looking, and we don't have big diffs from every single commit (especially important since jupyter notebooks can run into several MBs).

@JessicaS11
Copy link
Member

Thanks @weiji14 for this suggestion. I've updated the settings to require a linear git history via squash merge commits to the development branch to which PRs are submitted.

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