From 0dadf90aa9dd7ad9369fc3b66caf26c9513417d1 Mon Sep 17 00:00:00 2001
From: toast-ts <96593068+toast-ts@users.noreply.github.com>
Date: Wed, 10 Apr 2024 22:48:08 +1000
Subject: [PATCH] Pass 'rebase' flag

---
 src/commands/dev.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/dev.ts b/src/commands/dev.ts
index 6b46563..452c800 100644
--- a/src/commands/dev.ts
+++ b/src/commands/dev.ts
@@ -81,7 +81,7 @@ export default class Developer {
           if (interaction.replied) interaction.followUp(update_success);
           else interaction.reply(update_success);
         };
-        exec('git pull', {windowsHide:true}, (err:Error, stdout)=>{
+        exec('git pull --rebase', {windowsHide:true}, (err:Error, stdout)=>{
           if (err) hammondYouIdiot.edit(`\`\`\`${UsernameHelper(err.message)}\`\`\``);
           else if (stdout.includes('Already up to date')) hammondYouIdiot.edit('Repository is currently up to date.');
           else hammondYouIdiot.edit('Running `yarn tsc`...').then(()=>exec('yarn tsc', {windowsHide:true}, (err:Error)=>{