aboutsummaryrefslogtreecommitdiff
path: root/modules/git/repo_pull.go
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-09-02 09:26:56 -0400
committerUnknwon <u@gogs.io>2015-09-02 09:26:56 -0400
commit953bb06857f59f5c6987f68a08a94cf5a885b456 (patch)
tree196a45fa4e7f8808b35790981eb0e417bbfa1a61 /modules/git/repo_pull.go
parent6ea28f2a4759c5192811b12de054e7ad62f080f6 (diff)
basic PR feature
Diffstat (limited to 'modules/git/repo_pull.go')
-rw-r--r--modules/git/repo_pull.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/git/repo_pull.go b/modules/git/repo_pull.go
index a179e528..add32df9 100644
--- a/modules/git/repo_pull.go
+++ b/modules/git/repo_pull.go
@@ -84,3 +84,9 @@ func (repo *Repository) GetPatch(basePath, baseBranch, headBranch string) ([]byt
return stdout, nil
}
+
+// Merge merges pull request from head repository and branch.
+func (repo *Repository) Merge(headRepoPath string, baseBranch, headBranch string) error {
+
+ return nil
+}