third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py - Issue 2658713002: [WPT Export] Add merge_method: rebase to WPTGitHub.merge_pull_request

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py

Issue 2658713002: [WPT Export] Add merge_method: rebase to WPTGitHub.merge_pull_request (Closed)

Patch Set: Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py

index 4cc6fb82e0dc6fa747cb8bd94ea4b99e6acba51b..0f6d715d183b7fa6b651e45bed15caa6a393a4fe 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py

@@ -87,7 +87,9 @@ class WPTGitHub(object):

def merge_pull_request(self, pull_request_number):

path = '/repos/w3c/web-platform-tests/pulls/%d/merge' % pull_request_number

- body = {}

+ body = {

+ 'merge_method': 'rebase',

+ }

data, status_code = self.request(path, method='PUT', body=body)

if status_code == 200:

« no previous file with comments | « no previous file | no next file » | no next file with comments »