Spaces:

xiang-wuu
/

yolov5

Runtime error

glenn-jocher commited on Sep 18, 2021

Commit

9ef9494

•

1 Parent(s): 4c839ee

Update greetings.yml (#4856)

Files changed (1) hide show

.github/workflows/greetings.yml CHANGED Viewed

@@ -18,7 +18,7 @@ jobs:
             git remote add upstream https://github.com/ultralytics/yolov5.git
             git fetch upstream
             git checkout feature  # <----- replace 'feature' with local branch name
-            git rebase upstream/master
             git push -u origin -f
             ```
             - ✅ Verify all Continuous Integration (CI) **checks are passing**.

             git remote add upstream https://github.com/ultralytics/yolov5.git
             git fetch upstream
             git checkout feature  # <----- replace 'feature' with local branch name
+            git merge upstream/master
             git push -u origin -f
             ```
             - ✅ Verify all Continuous Integration (CI) **checks are passing**.