Thanks Lewis that's what I thought. I'll let you know if I have issues. BTW, I cloned my local copy from my fork; so "origin" is my fork and I added apache SDAP remote as "upstream"
On Tue, Jan 16, 2018 at 1:04 PM, lewis john mcgibbney <[email protected]> wrote: > If your interested in following work on this, take a look at > https://issues.apache.org/jira/browse/INFRA-15851 > Thanks > > On Tue, Jan 16, 2018 at 12:52 PM, lewis john mcgibbney <[email protected] > > > wrote: > > > Hi Frank, > > The action item is on me here to active the merge control over on Github. > > In the meantime, with SDAP-12, as an example you can do as follows > > > > $ git remote add fgreg https://github.com/apache/ > incubator-sdap-nexus.git > > $ git branch master > > $ git fetch fgreg > > $ git pull fgreg SDAP-12 > > $ git push origin master > > > > This assumes that origin maps to https://git-wip-us.apache.org/ > > repos/asf/incubator-sdap-nexus.git > > Any issues, let me know Frank and we can go through in more detail. I'll > > update this thread once Github merge's are available through the GUI. > This > > will streamline the work on the developer side. > > Thanks > > Lewis > > > > > > On Thu, Jan 11, 2018 at 2:33 PM, Frank Greguska <[email protected]> > wrote: > > > >> How do we actually do a merge to master again? It's not detailed in the > >> CONTRIBUTING.md doc. > >> > >> Do we just push to upstream master with a commit message 'This closes > #4' > >> > > > > > > > > -- > > http://home.apache.org/~lewismc/ > > http://people.apache.org/keys/committer/lewismc > > > > -- > > http://home.apache.org/~lewismc/ > > http://people.apache.org/keys/committer/lewismc > > > > > > > > <http://people.apache.org/keys/committer/lewismc> > > > > <http://people.apache.org/keys/committer/lewismc> > > <http://people.apache.org/keys/committer/lewismc> >
