@openvcs/git-plugin 0.3.2-edge.20260604.133 → 0.3.2-edge.20260612.144
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/git.js +1 -1
- package/bin/plugin-request-handler.js +1 -1
- package/package.json +2 -2
- package/src/git.ts +1 -1
- package/src/plugin-request-handler.ts +1 -1
package/bin/git.js
CHANGED
|
@@ -688,7 +688,7 @@ export class GitCommand {
|
|
|
688
688
|
break;
|
|
689
689
|
}
|
|
690
690
|
case 'rebase':
|
|
691
|
-
this.runChecked(['rebase', branch], 'git-
|
|
691
|
+
this.runChecked(['merge', '--rebase', branch], 'git-merge-failed');
|
|
692
692
|
break;
|
|
693
693
|
default:
|
|
694
694
|
this.runChecked(['merge', branch], 'git-merge-failed');
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openvcs/git-plugin",
|
|
3
|
-
"version": "0.3.2-edge.
|
|
3
|
+
"version": "0.3.2-edge.20260612.144",
|
|
4
4
|
"description": "Git VCS backend plugin for OpenVCS",
|
|
5
5
|
"author": "OpenVCS Contributors",
|
|
6
6
|
"license": "GPL-3.0-or-later",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
}
|
|
36
36
|
]
|
|
37
37
|
},
|
|
38
|
-
"version": "0.3.2-edge.
|
|
38
|
+
"version": "0.3.2-edge.20260612.144"
|
|
39
39
|
},
|
|
40
40
|
"scripts": {
|
|
41
41
|
"lint": "tsc -p tsconfig.json --noEmit",
|
package/src/git.ts
CHANGED
|
@@ -879,7 +879,7 @@ export class GitCommand {
|
|
|
879
879
|
break;
|
|
880
880
|
}
|
|
881
881
|
case 'rebase':
|
|
882
|
-
this.runChecked(['rebase', branch], 'git-
|
|
882
|
+
this.runChecked(['merge', '--rebase', branch], 'git-merge-failed');
|
|
883
883
|
break;
|
|
884
884
|
default:
|
|
885
885
|
this.runChecked(['merge', branch], 'git-merge-failed');
|