Merge script fails about zipkin HOT 4 CLOSED

Why not just use the web-based tools?

On Fri, May 17, 2013 at 10:30 AM, Johan Oskarsson
[email protected]:

I attempted to merge a pull request, but it seems our little merge scripts
is broken somehow.

[marburg zipkin (master)]$ bin/git-pull-request.rb merge 245
Executing: 'git config --get github.token'
warning: peer certificate won't be verified in this SSL session
Executing: 'git config --get github.token'
warning: peer certificate won't be verified in this SSL session
bin/git-pull-request.rb:187:in `merge': Not merging into master
(RuntimeError)
from bin/git-pull-request.rb:306

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/246
.

from zipkin.

Mostly because I prefer squashed commits. I generally work on a branch and commit all kinds of crap while I work on it. It's the end result that counts.

/Johan

On 17 maj 2013, at 10:39, Brian Degenhardt wrote:

Why not just use the web-based tools?

On Fri, May 17, 2013 at 10:30 AM, Johan Oskarsson
[email protected]:

I attempted to merge a pull request, but it seems our little merge scripts
is broken somehow.

[marburg zipkin (master)]$ bin/git-pull-request.rb merge 245
Executing: 'git config --get github.token'
warning: peer certificate won't be verified in this SSL session
Executing: 'git config --get github.token'
warning: peer certificate won't be verified in this SSL session
bin/git-pull-request.rb:187:in `merge': Not merging into master
(RuntimeError)
from bin/git-pull-request.rb:306

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/246
.

—
Reply to this email directly or view it on GitHub.

from zipkin.

That's a decent reason. I'll take a look at it for merging the new build.

On Fri, May 17, 2013 at 10:52 AM, Johan Oskarsson
[email protected]:

Mostly because I prefer squashed commits. I generally work on a branch and
commit all kinds of crap while I work on it. It's the end result that
counts.

/Johan

On 17 maj 2013, at 10:39, Brian Degenhardt wrote:

Why not just use the web-based tools?

On Fri, May 17, 2013 at 10:30 AM, Johan Oskarsson
[email protected]:

I attempted to merge a pull request, but it seems our little merge
scripts
is broken somehow.

[marburg zipkin (master)]$ bin/git-pull-request.rb merge 245
Executing: 'git config --get github.token'
warning: peer certificate won't be verified in this SSL session
Executing: 'git config --get github.token'
warning: peer certificate won't be verified in this SSL session
bin/git-pull-request.rb:187:in `merge': Not merging into master
(RuntimeError)
from bin/git-pull-request.rb:306

—
Reply to this email directly or view it on GitHub<
https://github.com/twitter/zipkin/issues/246>
.

—
Reply to this email directly or view it on GitHub.

—
Reply to this email directly or view it on GitHubhttps://github.com//issues/246#issuecomment-18076306
.

from zipkin.

I couldn't reproduce. Maybe because I checkout everything over ssh?

from zipkin.