PullReps: merge local main, instead of remote main

SunSerega · Apr 3, 2024 · 82985e9 · 82985e9
1 parent fdcce99
commit 82985e9
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/DataScraping/Reps/PullReps.pas b/DataScraping/Reps/PullReps.pas
@@ -62,12 +62,15 @@ procedure PullRep(name, branch, nick: string);
 
   ExecCommands(path, nick, nil
     , $'echo [checkout] && git checkout {branch} 2>&1'
-    , $'echo [pull] && git pull {remote_official} main & echo [pull-own]: && git pull {remote_own} {branch}'
+    , $'echo [pull-own]: && git pull {remote_own} {branch}'
+    , $'echo [fetch] && git fetch {remote_official} main:main'
+    , $'echo [pull] && git merge main'
   );
 
   if not disable_push then
     ExecCommands(path, nick, |'console only'|
-      , $'echo [push] && git push {remote_own} {branch} || cd .'
+      , $'echo [push main] && git push {remote_own} main || cd .'
+      , $'echo [push {branch}] && git push {remote_own} {branch} || cd .'
     );
 
   Otp($'Done pulling {nick}');