opencode-magi 0.0.0-dev-20260924050406 → 0.0.0-dev-20260924060731
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.
|
@@ -441,7 +441,7 @@ async function isConflict() {
|
|
|
441
441
|
await this.exec(command("git", "fetch", "--no-tags", quote(this.state.pr.metadata.base.repo.clone_url), quote(`refs/heads/${this.state.pr.metadata.base.ref}`)), options);
|
|
442
442
|
try {
|
|
443
443
|
try {
|
|
444
|
-
await this.exec(command("git", "merge", "--no-commit", "--no-ff", "FETCH_HEAD"), options);
|
|
444
|
+
await this.exec(command("git", "-c", "user.name=magi", "-c", "user.email=magi@localhost", "merge", "--no-commit", "--no-ff", "FETCH_HEAD"), options);
|
|
445
445
|
}
|
|
446
446
|
catch (e) {
|
|
447
447
|
const conflicts = await this.exec(command("git", "diff", "--name-only", "--diff-filter=U"), options);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "opencode-magi",
|
|
3
|
-
"version": "0.0.0-dev-
|
|
3
|
+
"version": "0.0.0-dev-20260924060731",
|
|
4
4
|
"description": "Multi-agent PR review and merge orchestration plugin for OpenCode.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Hirotomo Yamada <hirotomo.yamada@avap.co.jp>",
|