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

No Squashing any more :) #402

Closed
niccokunzmann opened this issue Dec 10, 2016 · 11 comments
Closed

No Squashing any more :) #402

niccokunzmann opened this issue Dec 10, 2016 · 11 comments

Comments

@niccokunzmann
Copy link
Member

Hi, I just saw something:

capture

@fossasia/gci16-maintainers @jig08 I think, they do not need to squash after all.

@niccokunzmann
Copy link
Member Author

Just creating this issue to inform you.

@niccokunzmann
Copy link
Member Author

Please close if you feel infomed.

@niccokunzmann
Copy link
Member Author

Also, I recognized a button - I do not know who can see it:

capture

Maybe that is the way to go for new people.

@codethejason
Copy link
Contributor

I personally know the option is there, but I think the point of having the PR people squashing their commits is for practice and Git knowledge.

@abishekvashok
Copy link
Member

I too knew about squashing and merging commits cause i had write access when the competition has started, I also recommended this to a lot of mentors but theu failed to know of it, this way we could help new members and help them out. While after we could offer them tutorials they could either look or not look at them let it be their choice. They would learn it in the coarse of time. @niccokunzmann i am not seeing that button. I am not having write access. This is the way to go for new people surely.

@jigyasa-grover
Copy link
Member

I personally know the option is there, but I think the point of having the PR people squashing their commits is for practice and Git knowledge.

++

@animeshsinghweb
Copy link
Member

animeshsinghweb commented Dec 11, 2016

That's great, but it can sometimes be overwhelming for students to completely understand rebasing in quick span of time, and hence if there is no merge conflict and if students need help squashing, this can be a great option @niccokunzmann :)

@m1guelpf
Copy link
Member

@niccokunzmann I shared that a few days ago, but mentors told me that squashing was a great practice

@m1guelpf
Copy link
Member

@niccokunzmann Maybe we should add this to mantainers.md, as some emntors are merging unsquashed PRs, and this may be the solution to that.

@jigyasa-grover
Copy link
Member

@m1guelpf Update mantainers.md accordingly.
Either the student should squash the commits into one, or the mentors should squash & merge before committing into the main repo.

@m1guelpf
Copy link
Member

@jig08 Updated mantainers.md and left there this issue for info. I think this can be closed...

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

6 participants