Glad you figured it out.  I was trying to follow what was going on --
because I've done similar and have not had an issue :)

-Nick


On Wed, Jul 2, 2014 at 5:01 PM, Chris Martin <windo...@gmail.com> wrote:

> Okay, I got it now.  Had to re-fork.  Basically I incorrectly fetched from
> apache/flex-sdk by creating another remote link. Should have used the
> existing one to get from "upsteam".
>
> Chris
>
>
> On Wed, Jul 2, 2014 at 11:38 AM, Chris Martin <windo...@gmail.com> wrote:
>
> > Hey everyone,
> >
> > Trying to tackle one of the bug tickets, FLEX-34378. I've been able to
> > produce a patch file and attach to the ticket, but I also wanted to
> create
> > a pull request.
> >
> > A while ago I forked the code and generated by first pull request
> > (FLEX-34324). It was nice and clean and the request only contained the
> > files I changed.
> >
> > Fast forward to yesterday. I noted that my fork of flex-sdk was woefully
> > behind (something like 44 commits have been made to develop since I
> > forked). So before I started to patch, I decided to fetch those into my
> > forked repository.
> >
> > I created a new branch in my fork from develop, made my changes, tested
> > and all looked great.  I created the patch file and added it to the
> > ticket.  But the pull request got a little odd. When I looked at my new
> > branch (FLEX-34378) it said it had two commits and was 0 commits behind
> > develop. So I clicked on the "Compare, review, create pull request"
> button
> > just to the right the branch selector on github.  Now when I review the
> > pull request, it shows that it has 46 commits, 133 files changed, and 7
> > contributors.  Am I right in expecting for this pull request to only
> > contain stuff that I did?
> >
> > I'm sure i'm either doing it wrong or not fully understanding how github
> > works.
> >
> > Thanks in advance!
> >
> > Chris
> >
>

Reply via email to