Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
MIME-Version: 1.0
In-Reply-To: 
 <CACOnxChx+2rxJVPkHkpm=2=7kVGj1-6vwqgrdQG+DOCrWTeZ1A@mail.gmail.com>
References: 
 <CAG97raca_LdxrdGTH96RQ83=Vf5enJkP6nWsTrnyjyJh98-N_w@mail.gmail.com>
	<CACOnxChx+2rxJVPkHkpm=2=7kVGj1-6vwqgrdQG+DOCrWTeZ1A@mail.gmail.com>
Date: Fri, 7 Aug 2015 07:11:41 -0300
Message-ID: 
 <CAG97radc8DRvmSBkOFh+FtrU6DQPLPkqMpgpNQRSW8_AiubCWQ@mail.gmail.com>
Subject: Re: Off topic about fork on git hub and pull requests
From: =?UTF-8?Q?Rafael_Weing=C3=A4rtner?= <rafaelweingartner@gmail.com>
To: "dev@cloudstack.apache.org" <dev@cloudstack.apache.org>
Content-Type: multipart/alternative; boundary=f46d04182808b8e4a0051cb5dccb

--f46d04182808b8e4a0051cb5dccb
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Many thanks mike that worked out.

On Fri, Aug 7, 2015 at 1:17 AM, Mike Tutkowski <mike.tutkowski@solidfire.co=
m
> wrote:

> If the end goal is to just have the master branch on your fork equal to t=
he
> master branch on origin, how's about fetching master on origin to your
> local system, then switching to your local master branch and executing "g=
it
> reset --hard origin/master" (assuming you don't have any work in
> progress...if you do, stash it first) and then executing "git push <your
> fork> master --force" and see if that does the trick?
>
> On Thu, Aug 6, 2015 at 5:46 PM, Rafael Weing=C3=A4rtner <
> rafaelweingartner@gmail.com> wrote:
>
> > Hi guys,
> > I know this might not be the right place to post it, but I bet that you
> > have the answer at the tip of your tongue.
> >
> > I have created a fork from https://github.com/apache/cloudstack, on tha=
t
> > fork I have made some changes and created a pull request. The pull
> request
> > was already accepted and merged into origin (
> > https://github.com/apache/cloudstack), master branch.
> >
> > Today I noticed that my fork was a few commits behind the origin branch=
,
> so
> > I changed the remote repository to https://github.com/apache/cloudstack=
,
> > fetched the commits and then pushed to my fork.
> >
> > The problem is the following, in my fork it is appearing as 4 commits
> ahead
> > of the origin in master branch, 2 commits that were already merged into
> the
> > origin, and 2 commits that represent the push I did to send the new
> commits
> > from origin to my fork.
> >
> > Now, If I try to create a new pull request, those commits are going to =
be
> > added into the pull request and I did not want to do that. Is there a w=
ay
> > to work around that?
> >
> > --
> > Rafael Weing=C3=A4rtner
> >
>
>
>
> --
> *Mike Tutkowski*
> *Senior CloudStack Developer, SolidFire Inc.*
> e: mike.tutkowski@solidfire.com
> o: 303.746.7302
> Advancing the way the world uses the cloud
> <http://solidfire.com/solution/overview/?video=3Dplay>*=E2=84=A2*
>


--=20
Rafael Weing=C3=A4rtner

--f46d04182808b8e4a0051cb5dccb--