Hello, I think it is git merge --no-ff gale-readme-updates -m "This closes #1" Where gale-readme-updates is the local copy of the github pull request. Seems to keep all the provenance from the pull request. I'll merge it in, you can shout later if you want ;)
Cheers, Ian On 12 May 2016 at 11:28, Ian Dunlop <[email protected]> wrote: > Hello, > > I was going to merge this then I realised that I've forgotten how I did it > before! What is the best way to merge pull requests? Basically we want to > keep the provenance while adding a "This closes #1" type message. I don't > think we have anything on the site about how to do it. > > Cheers, > > Ian > > On 11 May 2016 at 20:14, Ian Dunlop <[email protected]> wrote: > >> Hello, >> >> We should get this merged before any release. Thanks Gale. >> >> Cheers, >> >> Ian >> >> On 11 May 2016 at 17:54, Gale Naylor <[email protected]> wrote: >> >>> It looks like I still have an open pull request: >>> https://github.com/apache/incubator-taverna-commandline/pull/1 >>> >>> Gale >>> >> >> >
