Skip to content

Commit 88eeae2

Browse files
authored
Rename isConflict to isPRConflicts (#10)
1 parent ab01d38 commit 88eeae2

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

index.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,15 @@ collect.set('isPR', [
164164
'https://github.com/sindresorhus/refined-github/pull/148/commits/0019603b83bd97c2f7ef240969f49e6126c5ec85',
165165
]);
166166

167-
export const isConflict = (url: URL | Location = location): boolean => /^pull\/\d+\/conflicts/.test(getRepoPath(url)!);
168-
collect.set('isConflict', [
167+
export const isPRConflicts = (url: URL | Location = location): boolean => /^pull\/\d+\/conflicts/.test(getRepoPath(url)!);
168+
collect.set('isPRConflicts', [
169169
'https://github.com/sindresorhus/refined-github/pull/148/conflicts',
170170
]);
171171

172+
/** @deprecated use isPRConflicts instead */
173+
export const isConflict = isPRConflicts;
174+
collect.set('isConflict', combinedTestOnly);
175+
172176
/** Any `isDiscussionList` can display both issues and PRs, prefer that detection. `isPRList` only exists because this page has PR-specific filters like the "Reviews" dropdown */
173177
export const isPRList = (url: URL | Location = location): boolean => url.pathname === '/pulls' || getRepoPath(url) === 'pulls';
174178
collect.set('isPRList', [

0 commit comments

Comments
 (0)