On Tue, 28 Aug 2018 at 16:10, Jason Hsu, Ruby on High Speed Rails <[email protected]> wrote: > > As you know, a way to contribute to a project without being a collaborator is > to fork a project, create a branch, make the changes in your new branch, and > submit the new branch as a pull request. > > There are certain things I'd like to add to a project (like Bash scripts and > the annotate, rails-erd, and railroady gems), but the project collaborators > don't want them. I understand now that they don't expect me to suck it up > and do things their way. Instead, they want me to keep those features on > just my own personal branch but push other changes. > > How do I go about doing this? Do I make the changes to my personal fork's > master branch or a different branch? When the upstream repository is > updated, how do I update my personal branch to incorporate these changes > WITHOUT wiping out my personal features?
The technique I use is to make my personal changes on a branch. Then when the master is updated you can rebase the branch onto the tip of master. Colin > > -- > You received this message because you are subscribed to the Google Groups > "Ruby on Rails: Talk" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To post to this group, send email to [email protected]. > To view this discussion on the web visit > https://groups.google.com/d/msgid/rubyonrails-talk/dd563618-24c8-408c-b0aa-12a41f50bdf5%40googlegroups.com. > For more options, visit https://groups.google.com/d/optout. -- You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/rubyonrails-talk/CAL%3D0gLv%2Ba%2B0No2iRBjFJrBtbau%3DiaF04yAuU31XNLYvZ_UM%2BcA%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
