can someone spell out exact steps so we all do it the same way (whenever appropriate)?
On Thu, Jan 14, 2016 at 9:45 AM, Owen O'Malley <[email protected]> wrote: > On Thu, Jan 14, 2016 at 9:30 AM, Sean Schulte <[email protected]> > wrote: > > > For reference, the merging process is like so: > > > > 1. Add the official Apache repo as a remote in your local clone (one > > time step): git remote add apache > > https://git-wip-us.apache.org/repos/asf/incubator-metron.git > > 2. Checkout whatever branch you want to merge it into: git checkout > > master > > 3. Merge the pull request: git pull [email protected]: > charlesporter/incubator-metron.git > > master > > > > I generally prefer to have patches rebased into a single commit rather than > merged as a complicated history DAG. It makes tracking the changes to the > project much easier. > > .. Owen > > > > 4. Push the results to the Apache repo: git push apache master > > > > (Obviously replace step 3 with whatever repo/branch you’re actually > > merging from the PR.) > > > > On Jan 14, 2016, at 11:27 AM, Charles Porter < > [email protected] > > <mailto:[email protected]>> wrote: > > > > I forgot about the mirror aspect. > > > > thanks. > > > > On Thu, Jan 14, 2016 at 9:25 AM, P. Taylor Goetz <[email protected] > > <mailto:[email protected]>> wrote: > > > > The github repo is a read-only mirror of the Apache repo. > > > > You should have permission to push to the Apache repo. > > > > -Taylor > > > > On Jan 14, 2016, at 12:13 PM, Charles Porter <[email protected] > > <mailto:[email protected]>> > > wrote: > > > > I don't seem to have write access to the metron repo, at least not via > > the > > github UI. > > As a PMC member, I thought I would, but there is was no merge button on > > my > > UI when I looked at ehashman pull request. > > > > (someone else has now merged it, so that pull request is no longer an > > issue) > > > > Do I not understand the roles, or does someone need to check that we all > > have the right permissions? > > > > thanks. > > > > charles > > > > > > >
