We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
3way
patch-pytorch.sh
1 parent 01d1b36 commit c781b07Copy full SHA for c781b07
scripts/patch-pytorch.sh
@@ -25,10 +25,10 @@ apply_patch() {
25
echo "Applying patch $1"
26
cd "$REPO_ROOT"
27
if [[ -f $SCRIPTS_DIR/$1 ]]; then
28
- git apply --3way "$SCRIPTS_DIR/$1"
+ git apply "$SCRIPTS_DIR/$1"
29
else
30
fetch_patch "$1"
31
- git apply --3way "$SCRIPTS_DIR/$(basename "$1")"
+ git apply "$SCRIPTS_DIR/$(basename "$1")"
32
fi
33
}
34
0 commit comments