trying to keep local changes only

Signed-off-by: Sylvain Hellegouarch <sh@defuze.org>
chaostoolkit · Jul 11, 2022 · d112dfc · d112dfc
1 parent ae2ced5
commit d112dfc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -56,8 +56,8 @@ jobs:
 
           rm -f has_changes.txt
           git stash push requirements-chaostoolkit.txt
-          git merge '@{u}'
-          git stash show -p | git apply && git stash drop || true
+          git checkout stash -- .
+          #git stash show -p | git apply && git stash drop || true
 
           # echo "Pushing the new version and set of dependencies"
           echo ${CAL_VERSION} > VERSION