Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

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

Projects
None yet
3 participants
Member

steveklabnik commented Nov 9, 2012

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?

Owner

pixeltrix commented Nov 9, 2012

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

Member

steveklabnik commented Nov 9, 2012

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

Steve Klabnik + Katrina Owen Add note about squashing in contributor guide.
We tell people how to do this all the time in the Issues tracker,
so now we can just point them here.
c980af6
Owner

fxn commented Nov 9, 2012

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

Member

steveklabnik commented Nov 9, 2012

Updated!

@fxn fxn added a commit that referenced this pull request Nov 9, 2012

@fxn fxn Merge pull request #8152 from steveklabnik/squashing_guide
Add note about squashing in contributor guide.
c33cfa6

@fxn fxn merged commit c33cfa6 into rails:master Nov 9, 2012

Member

steveklabnik commented Nov 9, 2012

@fxn yep! it credited both of us. 🤘

Owner

fxn commented Nov 9, 2012

❤️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment