config-build-env: reset from origin to avoid merge/rebase conflicts
PATCH 1/1 config-build-env: reset from origin to avoid merge/rebase conflicts
From: Denys Dmytriyenko <[email protected]>
Signed-off-by Denys Dmytriyenko <[email protected]>
--- lib/oesdk/config-build-env | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/oesdk/config-build-env +2 -1
@@ -26,7 +26,8 @@ checkout_layer_scripts() { then #This looks to be a git repo. Hopefully it is the right one :) cd $BUILD_ROOT - git pull + git fetch + git reset --hard origin else echo "The $BUILD_ROOT directory is not empty and is not a git repo" exit 1
Signature · 1 line
2.7.4