You can't merge directly on GitHub - they only host a read-only mirror of the repo. There are however command-line options for merging, which you can see on the PR page. Other than that, you can mark something as merged by putting "This fixes (or closes, merges etc) #1234" where 1234 is the issue or PR number.
With regards, Daniel. On 2016-01-24 04:59, Joel Bernstein <joels...@gmail.com> wrote: > I had no problem pushing my first commit. But I didn't seem to have > permission to merge a pull-request from Github. Is there another layer of > permissions that need to be setup for this? > > Joel Bernstein > http://joelsolr.blogspot.com/ > > On Sat, Jan 23, 2016 at 1:23 PM, Yonik Seeley <ysee...@gmail.com> wrote: > > > Here's a useful thing you can add to your .profile , it conditionally > > displays the branch you are on in your shell prompt: > > https://gist.github.com/yonik/04b2e759eecf5ef96383 > > > > Example: > > > > /opt/code$ cd lusolr > > [master] /opt/code/lusolr$ > > > > -Yonik > > > > > > On Sat, Jan 23, 2016 at 12:55 PM, Ramkumar R. Aiyengar > > <andyetitmo...@gmail.com> wrote: > > > Not a big deal, but guys, do check if your mail is set properly in > > > ~/.gitconfig, otherwise commits would show your personal mail as the > > author. > > > Committer still shows up as your apache mail address, but many UIs hide > > it > > > by default, and might not be apparent to those new to the project/git.. > > > > > > Example .gitconfig snippet allowing you to keep your existing name/mail > > but > > > override for apache.org.. > > > > > > [user "https://git-wip-us.apache.org";] > > > name = Ramkumar Aiyengar > > > mail = andyetitmo...@apache.org > > > > > > > > > On Sat, Jan 23, 2016 at 3:41 PM, Uwe Schindler <u...@thetaphi.de> wrote: > > >> > > >> Hi, > > >> > > >> I migrated all Policeman and ASF Jenkins Jobs to Git. Everything should > > be > > >> set up now. > > >> The Jobs for 5.3 and 5.4 were deleted. > > >> > > >> Uwe > > >> > > >> ----- > > >> Uwe Schindler > > >> H.-H.-Meier-Allee 63, D-28213 Bremen > > >> http://www.thetaphi.de > > >> eMail: u...@thetaphi.de > > >> > > >> > > >> > -----Original Message----- > > >> > From: Uwe Schindler [mailto:u...@thetaphi.de] > > >> > Sent: Saturday, January 23, 2016 11:05 AM > > >> > To: dev@lucene.apache.org > > >> > Subject: RE: GIT migration complete > > >> > > > >> > Hi, > > >> > > > >> > Thanks! I am talking care of Jenkins at the moment. > > >> > > > >> > First Policeman one is working: > > >> > http://jenkins.thetaphi.de/job/Lucene-Solr- > > >> > trunk-Linux/15619/console > > >> > > > >> > The Changes I do for jenkins is: > > >> > - Deleted *all* workspaces to have clean start > > >> > - Change all Jobs (is a bit of work as manually, especially for ASF) > > to > > >> > use Git > > >> > checkouts of corresponding branch > > >> > - Add the following "additional behaviour" config: Clean before > > >> > checkout: > > >> > Clean up the workspace before every checkout by deleting all untracked > > >> > files > > >> > and directories, including those which are specified in .gitignore. It > > >> > also resets > > >> > all tracked files to their versioned state. This ensures that the > > >> > workspace is in > > >> > the same state as if you cloned and checked out in a brand-new empty > > >> > directory, and ensures that your build is not affected by the files > > >> > generated > > >> > by the previous build. > > >> > > > >> > Uwe > > >> > > > >> > ----- > > >> > Uwe Schindler > > >> > H.-H.-Meier-Allee 63, D-28213 Bremen > > >> > http://www.thetaphi.de > > >> > eMail: u...@thetaphi.de > > >> > > > >> > > From: Dawid Weiss [mailto:dawid.we...@gmail.com] > > >> > > Sent: Saturday, January 23, 2016 10:13 AM > > >> > > To: dev@lucene.apache.org > > >> > > Subject: GIT migration complete > > >> > > > > >> > > Ok, folks. Seems like code migration is complete, with both gh > > mirrors > > >> > > and Apache repos up. > > >> > > > > >> > > 1. Please read the docs at: https://git-wip-us.apache.org/ > > >> > > > > >> > > 2. I didn't realize Apache's repositories are over https, which > > makes > > >> > > authorization rather painful for Linux users (requires password > > typing > > >> > > on every push). I think I'll stick with gh for this reason and only > > >> > > push my changes when they're fully baked. > > >> > > > > >> > > 3. The master branch (former trunk) passes ant precommit for me, > > but I > > >> > > didn't apply build patches to branch_5x yet. > > >> > > > > >> > > If there are any problems or concerns, let me know (perhaps I'll be > > >> > > able to help). > > >> > > > > >> > > Dawid > > >> > > > > >> > > > > --------------------------------------------------------------------- > > >> > > To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org > > >> > > For additional commands, e-mail: dev-h...@lucene.apache.org > > >> > > > >> > > > >> > --------------------------------------------------------------------- > > >> > To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org > > >> > For additional commands, e-mail: dev-h...@lucene.apache.org > > >> > > >> > > >> --------------------------------------------------------------------- > > >> To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org > > >> For additional commands, e-mail: dev-h...@lucene.apache.org > > >> > > > > > > > > > > > > -- > > > Not sent from my iPhone or my Blackberry or anyone else's > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org > > For additional commands, e-mail: dev-h...@lucene.apache.org > > > > > ------ Sent via Pony Mail for dev@lucene.apache.org. View this email online at: https://pony-poc.apache.org/list.html?dev@lucene.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org For additional commands, e-mail: dev-h...@lucene.apache.org
