From 25336837f3135a8789ac7cd2793503ae0d488de6 Mon Sep 17 00:00:00 2001 From: Avichai Cohen Date: Tue, 11 Jun 2019 15:41:26 +0300 Subject: [PATCH 1/3] adding pull.yml file --- .github/pull.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/pull.yml diff --git a/.github/pull.yml b/.github/pull.yml new file mode 100644 index 000000000..06f0291ad --- /dev/null +++ b/.github/pull.yml @@ -0,0 +1,5 @@ +version: "1" +rules: + - base: master + upstream: aviperes:master # change `wei` to the owner of upstream repo + mergeMethod: hardreset From b100e95f198ae95a4b9735f46a5674e99547b9aa Mon Sep 17 00:00:00 2001 From: Avichai Cohen Date: Tue, 11 Jun 2019 15:44:38 +0300 Subject: [PATCH 2/3] going for a conflict!!! ya!! --- youtube_dl/extractor/facebook.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py index 8d278d485..14ca712a7 100644 --- a/youtube_dl/extractor/facebook.py +++ b/youtube_dl/extractor/facebook.py @@ -428,7 +428,7 @@ class FacebookIE(InfoExtractor): timestamp = int_or_none(self._search_regex( r']+data-utime=["\'](\d+)', webpage, 'timestamp', default=None)) - # adding a meaningless comment. we will need to remove it eventually + # changed the comment from my fork thumbnail = self._og_search_thumbnail(webpage) view_count = parse_count(self._search_regex( From 6683833b117c5ece7b395f4053c0b95b21a5d811 Mon Sep 17 00:00:00 2001 From: Avichai Cohen Date: Tue, 11 Jun 2019 15:51:30 +0300 Subject: [PATCH 3/3] changing pull.yml with the hope to get pull request... --- .github/pull.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/pull.yml b/.github/pull.yml index 06f0291ad..1a2188824 100644 --- a/.github/pull.yml +++ b/.github/pull.yml @@ -3,3 +3,8 @@ rules: - base: master upstream: aviperes:master # change `wei` to the owner of upstream repo mergeMethod: hardreset + assignees: + - hashark + reviewers: + - hashark +