Skip to content

Commit

Permalink
Part of OpenHistoricalMap/issues#786, adjusting workflow.
Browse files Browse the repository at this point in the history
  • Loading branch information
erictheise committed Jul 8, 2024
1 parent 9d70f0b commit 212197c
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions scripts/upstream_sync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ git checkout -b the-sacrifice

mkdir upstream
for i in $(git ls-tree upstream/master --name-only); do
echo $i
if [[ $i == *.md ]];then
git show upstream/master:$i > upstream/$i
fi
Expand All @@ -19,6 +20,8 @@ if [ -n "$(git status --porcelain)" ]; then
git commit -m 'Preserving upstream markdown & text files.'
fi

git status

#git merge --no-ff --no-commit upstream/master
#concerns=('js/ide.js' 'js/map.ts')
#for i in $(git diff --name-only --diff-filter=U --relative);do
Expand Down

0 comments on commit 212197c

Please sign in to comment.