diff options
| author | Paulo Custodio <pauloscustodio@gmail.com> | 2021-10-25 14:28:51 +0100 |
|---|---|---|
| committer | Paulo Custodio <pauloscustodio@gmail.com> | 2021-10-25 14:28:51 +0100 |
| commit | e1d39a471bbb1231f02593283ade0b7d3072e778 (patch) | |
| tree | 98537ef81b090c59147a44ead94d97b5914df21a | |
| parent | 102d2d087317bc309c78528411aec474ed93b8e2 (diff) | |
| download | perlweeklychallenge-club-e1d39a471bbb1231f02593283ade0b7d3072e778.tar.gz perlweeklychallenge-club-e1d39a471bbb1231f02593283ade0b7d3072e778.tar.bz2 perlweeklychallenge-club-e1d39a471bbb1231f02593283ade0b7d3072e778.zip | |
Merge instead of rebasing
| -rw-r--r-- | challenge-001/paulo-custodio/update.sh | 4 |
1 files 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 |