From e1d39a471bbb1231f02593283ade0b7d3072e778 Mon Sep 17 00:00:00 2001 From: Paulo Custodio Date: Mon, 25 Oct 2021 14:28:51 +0100 Subject: Merge instead of rebasing --- challenge-001/paulo-custodio/update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/challenge-001/paulo-custodio/update.sh b/challenge-001/paulo-custodio/update.sh index 83d7cebe71..b0079a2ebd 100644 --- a/challenge-001/paulo-custodio/update.sh +++ b/challenge-001/paulo-custodio/update.sh @@ -8,5 +8,5 @@ git push -u origin master git checkout devel git pull -git rebase master -git push --force -u origin devel +git merge master +git push -u origin devel -- cgit