GitBucket
|
Merge pull request #1804 from gitbucket/show-conflict-files
Show conflicting files if pull request can't be merged |
|---|
|
GitHub
committed
on 12 Dec 2017
|
| src/main/scala/gitbucket/core/controller/PullRequestsController.scala |
|---|
| src/main/scala/gitbucket/core/service/MergeService.scala |
|---|
| src/main/scala/gitbucket/core/service/PullRequestService.scala |
|---|
| src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html |
|---|
| src/test/scala/gitbucket/core/service/MergeServiceSpec.scala |
|---|