ynkmr/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-09-08 14:03:24 +09:00
Code Issues Projects Releases Wiki Activity

chore: Move import path from code.gitea.io/gitea to gitea.dev (#37873)

Browse Source
This commit is contained in:
Lunny Xiao
2026-05-26 15:49:31 -07:00
committed by GitHub
parent a03e0364eb
commit 61b1a39efe
2411 changed files with 11717 additions and 11717 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/pull/merge_tree.go
+5 -5
View File
@@ -8,11 +8,11 @@ import (
"errors"
"fmt"
issues_model "code.gitea.io/gitea/models/issues"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/git/gitcmd"
"code.gitea.io/gitea/modules/gitrepo"
"code.gitea.io/gitea/modules/log"
issues_model "gitea.dev/models/issues"
"gitea.dev/modules/git"
"gitea.dev/modules/git/gitcmd"
"gitea.dev/modules/gitrepo"
"gitea.dev/modules/log"
)
// checkConflictsMergeTree uses git merge-tree to check for conflicts and if none are found checks if the patch is empty