From a2c3dc1d0443e7a93d8733ef8b6cafa26798ca9a Mon Sep 17 00:00:00 2001 From: djl11 Date: Tue, 15 Mar 2022 22:37:15 +0100 Subject: [PATCH] updated merge_with_upstream.sh so that it does not fail if upstream has already been added. --- merge_with_upstream.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge_with_upstream.sh b/merge_with_upstream.sh index 7dd368c4a92e0..2655e20e2711e 100755 --- a/merge_with_upstream.sh +++ b/merge_with_upstream.sh @@ -1,6 +1,6 @@ #!/bin/bash -e git checkout "$1" -git remote add upstream https://github.com/unifyai/ivy.git +git remote add upstream https://github.com/unifyai/ivy.git || true git fetch upstream git merge upstream/master --no-edit git push