added examples for squashing

[OskarStark]

No description provided.

[javiereguiluz]

@OskarStark thanks for adding this tip about squashing commits.

However, I'd like to propose to not merge this PR and even to remove any reference to commit squashing. Why? Because Symfony project uses a proprietary tool which automatically squashes all commits before merging. That's why on symfony and symfony-doc we no longer ask users to squash their commits.

The less hurdles we define for collaborating with Symfony, the better.

[OskarStark]

Hey @javiereguiluz

thanks for the detailed answer. I agree with you , but then I would write down explicitly so.

@hurdeless: 👍

[javiereguiluz]

@OskarStark if the Symfony doc managers agree on removing any reference to squashing commits, I agree with you about explaining that we no longer require squashing. Thanks.

[OskarStark]

👍 lets see, what they say! 😃

[xabbuh]

For me, that's okay. But I leave the final word to @weaverryan and @wouterj who do the actual merges.

[weaverryan]

+1 - let's remove everything about squashing. Thanks @OskarStark for bringing attention on this - let's make things easier!

[xabbuh]

@OskarStark Can you please remove all the squashing stuff then? :)

[OskarStark]

New PR here: #5432

[xabbuh]

closing in favor of #5432 then

[wouterj]

Thank you for your patience and great actions on this PR Oskar. You deserve the Documenation Contributor Badge on SensioLabs Connect (which will be awared in a few hours/days)! :)

[wouterj]

Hmm, our merge tool didn't really get which PR I wanted to merge...

[OskarStark]

yeah, great, thank you!

@problem: can i help @wouterj

[wouterj]

I believe I've merged the correct PR now (and I've reverted this merge)

[OskarStark]

@wouterj didn't get the badge already :(

[xabbuh]

@OskarStark Is the e-mail address you used in the commit also associated with your SensioLabs Connect account?

[OskarStark]

yes it is

[OskarStark]

maybe it is, because @wouterj merged the other PR?

• removed squashing stuff. fixes #5368 #5432

[wouterj]

@OskarStark sensiolabs connect uses the commits, and you are the author of some commits in the doc repository: https://github.com/symfony/symfony-docs/commits?author=OskarStark

There has to be something wrong with your emailadress. On the doc contributors page, you're on place 622 at the moment of writing this comment. As you can see, it displays just your name and no link to your sensiolabs account. This means it can't match your commits to your sensiolabs profile.

[javiereguiluz]

@OskarStark this issue happens when the GitHub email is not exactly the same as the SensioLabs Connect profile one. The solution is very easy: you can add any number of emails in your SensioLabs Connect account at https://connect.sensiolabs.com/#!email

However, you say that the email address is the same ... so I'm going to investigate which could be the cause of this problem.

[OskarStark]

could this be the problem?

Keep my email address private
We will use OskarStark@users.noreply.github.com when performing web-based Git operations and sending email on your behalf. If you want command line Git operations to use your private email you must

this is from the github settings page

[wouterj]

@OskarStark I think that could be the problem. The solution is to add this email to the email list on your SensioLabs account.

As you can see, the Github API indeed returns your commits with the OskarStark@users.noreply.github.com email adress: https://api.github.com/repos/symfony/symfony-docs/pulls/5368/commits

[OskarStark]

and for this pr is used the web interface completely

[OskarStark]

@wouterj i will do, give me a second

[wouterj]

(be aware that after you added your email, you have to wait until the system rebuilds, so check again tomorrow if everything is fixed)

[OskarStark]

ok, i added it, but i'm not sure if i get a confirmation mail to this mailadress

[javiereguiluz]

Sadly the badges aren't granted in a retroactive fashion when changing or updating the emails, so we'll need to wait until the next contribution.