Scenario: I have two branches, master and stable.  Stable has updates
that I don't want in master at this point.  Then I create a new branch
off of stable to do some fixes.  When I'm done making updates to the
new branch, I can easily add the fixes back into stable with a merge.
But for master, I would just like to merge in the updates made to the
branch since it was created.  How do I go about merging in just the
modifications made to the new branch without merging in the old
alterations from the stable branch, which the new branch was based on?

--linpan

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"GitHub" 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/github?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to