Merge pull request #4290 from kazuhitoyokoi/dev-fixgitpull

Fix git pull operation in project feature
node-red · Aug 21, 2023 · 89b8e88 · 89b8e88
2 parents c39d3db + a7e80f3
commit 89b8e88
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/index.js
@@ -431,7 +431,7 @@ module.exports = {
         return runGitCommand(args,cwd);
     },
     pull: function(cwd,remote,branch,allowUnrelatedHistories,auth,gitUser) {
-        var args = ["pull"];
+        var args = ["pull", "--no-rebase"];
         if (remote && branch) {
             args.push(remote);
             args.push(branch);