OK, I was trying to check out a pull request today and I realized there is something missing from this setup. Namely, we need a remote for the Apache GitHub mirror because pull requests are submitted there. So my revised setup is now:
→ git remote -v apache https://git-wip-us.apache.org/repos/asf/incubator-samoa.git (fetch) apache https://git-wip-us.apache.org/repos/asf/incubator-samoa.git (push) origin [email protected]:gdfm/incubator-samoa.git (fetch) origin [email protected]:gdfm/incubator-samoa.git (push) upstream [email protected]:apache/incubator-samoa.git (fetch) upstream [email protected]:apache/incubator-samoa.git (push) And if I want to checkout a pull request I can simply do: git fetch upstream pull/<pr_id>/head:<branch_name> E.g., git fetch upstream pull/2/head:SAMOA-6 creates a branch SAMOA-6 with the pull request checked out. Cheers, -- Gianmarco On 28 January 2015 at 10:22, Gianmarco De Francisci Morales <[email protected] > wrote: > Hi, > > Just for me to be clear: GM, we’re talking rebasing locally but merge >> committing in the repo right? Like we have been doing before? At least, >> that’s how I read this right now. correct me if I’m wrong? >> > > > Yes, that's what I meant. > Rebase the master locally (never commit to the local master), fork, merge > commit back in the repo (possibly squashing all the commits on the branch > in a single one that represents the patch). > > Cheers, > -- > Gianmarco >
