From 6741a901aad5c55f5ef21b9fc97c940f986a74d0 Mon Sep 17 00:00:00 2001
From: Glenn Jocher <glenn.jocher@ultralytics.com>
Date: Sat, 18 Sep 2021 18:43:26 +0200
Subject: [PATCH] Update greetings.yml (#4856)

---
 .github/workflows/greetings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
index c557e77f3b70..a40d0a50c8ac 100644
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@@ -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 merge upstream/master
             git push -u origin -f
             ```
             - ✅ Verify all Continuous Integration (CI) **checks are passing**.