Mailing-List: contact callback-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: callback-dev@incubator.apache.org
Received-SPF: pass (athena.apache.org: domain of agrieve@google.com designates
 209.85.214.175 as permitted sender)
MIME-Version: 1.0
In-Reply-To: 
 <CAE6O_-ZSzk9aPS5LPtHzxDuf5uZXzXKKZih5F+_8QmtyrAX2pA@mail.gmail.com>
References: 
 <CAE6O_-ZSzk9aPS5LPtHzxDuf5uZXzXKKZih5F+_8QmtyrAX2pA@mail.gmail.com>
From: Andrew Grieve <agrieve@google.com>
Date: Thu, 26 Jul 2012 16:12:28 -0400
Message-ID: 
 <CABiQX1UNx9distGNtLBRd8WmEurwE6xpJh0MKePfzvSTYpFUaQ@mail.gmail.com>
Subject: Re: Integrating pull-requests
To: callback-dev@incubator.apache.org
Content-Type: multipart/alternative; boundary=14dae9399ce728146304c5c1382b

--14dae9399ce728146304c5c1382b
Content-Type: text/plain; charset=ISO-8859-1

I'd like wiki page to spell this out. Can someone have a look at the
following and tell me if it's correct? Any guidance on when to merge vs.
cherrypick? Do we ever want to use --squash?


One-time setup:
git remote add apache git://git.apache.org/incubator-cordova-ios.git

Review the change:
- View the user's branch in github and request changes be made (if
applicable) by adding comments in the web interface
- Ensure that commit descriptions are accurate and that they reference any
related JIRA bugs.


git remote add foo git://github.com/user/incubator-cordova-ios.git
git fetch foo
git checkout master
git pull apache master
git merge --ff-only foo/branch_name
// If this fails, then ask committer to pull, rebase & push. Unless... is
there a way to resolve this if the merge is simple???
git push apache master
git remote rm foo

Update related JIRA issue with the commit ID and close it if appropriate.
Respond to pull request on github with link to their commit and ask them to
close pull request.


On Thu, Jul 12, 2012 at 4:18 PM, Shazron <shazron@gmail.com> wrote:

> Re:
> https://issues.apache.org/jira/browse/CB-765?focusedCommentId=13412936#comment-13412936
>
> Just FYI if you are integrating pull requests it is important to
> maintain authorship history (merge or cherry pick), and not copy and
> paste the contributed code in.
>

--14dae9399ce728146304c5c1382b--