Merge pull request #1802 from gitbucket/merge-strategy

Fork: 0

Gatewify / GitBucket

Browse code Merge pull request #1802 from gitbucket/merge-strategy Add a pulldown menu to choose the merge strategy patch-3 test 4.31.2 4.31.1 4.31.0 4.30.1 4.30.0 4.29.0 4.28.0 4.27.0 4.26.0 4.25.0 4.24.1 4.24.0 4.23.1 4.23.0 4.22.0 4.21.2 4.21.1 4.21.0 4.20.0 1.0.0
commit 0e04925b6bb587df7e1366fdd9f9fde9a3bdfb6d 2 parents 847f96d + 9a12725 Naoki Takezoe authored on 12 Dec 2017 GitHub committed on 12 Dec 2017

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/PullRequestsController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/MergeService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/JGitUtil.scala

Ignore Space Show notes View src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html

Show line notes below