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

Add note about squashing in contributor guide. #8152

Merged
merged 1 commit into from Nov 9, 2012

Conversation

steveklabnik
Copy link
Member

We tell people how to do this all the time in the Issues tracker,
so now we can just point them here.

This is a first commit pairing by @kytrinyx and I, so @fxn, can you check the authorship and make sure it makes sense?

@pixeltrix
Copy link
Contributor

Do we want to add a paragraph about the justification for squashing? Easier to revert, cleaner git history etc.

@steveklabnik
Copy link
Member Author

Sure. I'll add it and then squash the two commits together. ;)

We tell people how to do this all the time in the Issues tracker,
so now we can just point them here.
@fxn
Copy link
Member

fxn commented Nov 9, 2012

Awesome! Authorship looks good, I think the contrib app is going to credit you both automatically.

@steveklabnik
Copy link
Member Author

Updated!

fxn added a commit that referenced this pull request Nov 9, 2012
Add note about squashing in contributor guide.
@fxn fxn merged commit c33cfa6 into rails:master Nov 9, 2012
@steveklabnik
Copy link
Member Author

@fxn yep! it credited both of us. 🤘

@fxn
Copy link
Member

fxn commented Nov 9, 2012

❤️

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

Successfully merging this pull request may close these issues.

None yet

3 participants