From 21b1df661aeb04bd3379d93d45d12bfefa3e682b Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 16 Feb 2020 13:20:31 -0600 Subject: [PATCH] try fix sync with upstream overriding local changes --- data/FilterList.json | 2 +- server/azure-pipelines.migrate.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 500557d7f..23992c64f 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -12,7 +12,7 @@ }, { "id": 2, - "description": "Mute is an AdBlock Plus filter for user comments. In the same way that AdBlock hides ads, AdBlock can use this filter to hide user-generated comments, allowing you to browse the Internet with less stupidity clawing at your eyeballs.", + "description": "TEMP Mute is an AdBlock Plus filter for user comments. In the same way that AdBlock hides ads, AdBlock can use this filter to hide user-generated comments, allowing you to browse the Internet with less stupidity clawing at your eyeballs.", "descriptionSourceUrl": "https://github.com/B-Con/mute", "homeUrl": "https://github.com/B-Con/mute", "issuesUrl": "https://github.com/B-Con/mute/issues", diff --git a/server/azure-pipelines.migrate.yaml b/server/azure-pipelines.migrate.yaml index 0a17c9606..1304dc72d 100644 --- a/server/azure-pipelines.migrate.yaml +++ b/server/azure-pipelines.migrate.yaml @@ -87,7 +87,7 @@ steps: git remote add upstream https://github.com/collinbarrett/FilterLists.git git fetch upstream git checkout master 'data/*.json' 'server/src/FilterLists.Data.Migrations/*' - git merge upstream/master + git rebase upstream/master CONFLICTS=$(git ls-files -u | wc -l) if [ "$CONFLICTS" -gt 0 ] ; then echo "Data changes conflict with upstream master. Aborting..."