I agree with Konstantin (everzet). Don't commit things to your master if you want to keep a clean fork of upstream symfony. Once your patches are accepted upstream, you can then merge into your master (from remote) and just delete your local branch.
See: http://docs.symfony-reloaded.org/contributing/code/patches.html The above is a bit similar to Doctrine's guidelines (also good reading for added explanation of git commands): http://www.doctrine-project.org/contribute On Fri, Nov 12, 2010 at 5:20 AM, ever.zet <[email protected]> wrote: > Do not merge branches. Simply push them on GitHub & send pull request from > one of this branches. > > 12.11.2010, в 0:44, gordonslondon <[email protected]> написал(а): > > > Hi, > > I ask this question in the dev list, because people who contribute to > > Symfony are in the dev list > > I would like to contribute too but i'm a git newbie, i've a question: > > > > I start with a new repository. I've followed this: > > http://docs.symfony-reloaded.org/contributing/code/patches.html > > > > * TOPIC-BRANCH-1 > > I create a topic branch (topic-branch-1) => git checkout -b topic- > > branch-1 > > I make some modifications and commit => git add . (and after) git > > commit -am "commit 1" > > I rebase master => git rebase master > > My modifications are now on master and topic-branch-1 > > > > * TOPIC-BRANCH-2 > > Now i want to create another topic branch (topic-branch-2): > > => git checkout master > > => git checkout -b topic-branch-2 > > And do modifications and commit in the same way as topic-branch-1. > > > > * PULL REQUEST > > Now when i want to do a pull request to Symfony2 project with my > > (topic-branch-2), the pull request contains commits of (topic- > > branch-1) and (topic-branch-2). I can't commit theses changes because > > they aren't separated. > > > > What is the method to use to keep a clean history of all my personal > > modifications when creating a new topic branch ? > > Should i use a third branch without any personal modifications to do > > this ? > > > > -- > > If you want to report a vulnerability issue on symfony, please send it to > security at symfony-project.com > > > > You received this message because you are subscribed to the Google > > Groups "symfony developers" group. > > To post to this group, send email to [email protected] > > To unsubscribe from this group, send email to > > [email protected]<symfony-devs%[email protected]> > > For more options, visit this group at > > http://groups.google.com/group/symfony-devs?hl=en > > -- > If you want to report a vulnerability issue on symfony, please send it to > security at symfony-project.com > > You received this message because you are subscribed to the Google > Groups "symfony developers" group. > To post to this group, send email to [email protected] > To unsubscribe from this group, send email to > [email protected]<symfony-devs%[email protected]> > For more options, visit this group at > http://groups.google.com/group/symfony-devs?hl=en > -- jeremy mikola -- If you want to report a vulnerability issue on symfony, please send it to security at symfony-project.com You received this message because you are subscribed to the Google Groups "symfony developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/symfony-devs?hl=en
