prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

try fix sync with upstream overriding local changes

Browse source
This commit is contained in:
Collin M. Barrett 2020-02-16 13:15:20 -06:00
parent 02d53fcbbf
commit bd549c9f4d
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/FilterList.json
View file

@ -1,7 +1,7 @@
[
{
"id": 1,
"description": "A filter list that blocks mobile advertisements and trackers on Japanese properties",
"description": "TEMP A filter list that blocks mobile advertisements and trackers on Japanese properties",
"homeUrl": "https://280blocker.net",
"licenseId": 1,
"name": "280 Blocker",

1
server/azure-pipelines.migrate.yaml
View file

@ -87,6 +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
CONFLICTS=$(git ls-files -u | wc -l)
if [ "$CONFLICTS" -gt 0 ] ; then
echo "Data changes conflict with upstream master. Aborting..."