Codecast: Contributing to Rails 07 - Epilogue: Contribution Accepted
Channel: Stateless Code
Date: 2021-08-03

In this 7th video of the Contributing to Rails series, Mike receives news that his pull request has been merged into the Rails main branch!

This video covers:
0:00:10 - Intro and review GitHub alerts
0:00:50 - When issues and pull requests are marked stale
0:02:02 - Comment on issue and pull request re-opened by Rails team
0:02:44 - Finding your contribution on rubyonrails.org
0:05:00 - Lessons learned
0:06:00 - Hypothetical conflict resolution
# fetch latest from rails main
git fetch rails/main
# check out local branch and rebase against rails main
git checkout scaffold_system_gen_fix
git rebase -i rails/main
# after resolving conflicts, update timestamp on commit
git commit --amend -S --no-edit --date=now
# force-push changes to remote on GitHub
git push -f


00:07:13 Final thoughts


This video is CC0 - No rights reserved. (YouTube doesn't allow this option when publishing.) All code is released under the UNLICENSE.  Stateless Code denies the concept of "intellectual property". Copying is not stealing.