cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mike Tutkowski <mike.tutkow...@solidfire.com>
Subject Re: Off topic about fork on git hub and pull requests
Date Fri, 07 Aug 2015 04:17:28 GMT
If the end goal is to just have the master branch on your fork equal to the
master branch on origin, how's about fetching master on origin to your
local system, then switching to your local master branch and executing "git
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ärtner <
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 that
> 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 way
> to work around that?
>
> --
> Rafael Weingärtner
>



-- 
*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=play>*™*

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message