]> source.dussan.org Git - gitea.git/commit
projects / gitea.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 680a57c) | patch
Pull request conflict files detection (#5951)
authorLunny Xiao <xiaolunwen@gmail.com>
Tue, 5 Feb 2019 11:54:49 +0000 (19:54 +0800)
committertechknowlogick <matti@mdranta.net>
Tue, 5 Feb 2019 11:54:49 +0000 (06:54 -0500)
commitbf4badad1d68c18d7ffb92c69e09e4e8aa252935
tree9e8c3a41eba604738e632d921a2de97334e35e03tree | snapshot
parent680a57ce921f6d8c8752fa27aad6c95865fe8127commit | diff
Pull request conflict files detection (#5951)

* add conflict detection

* test pull request conflict files

* fix detection files number

* fix comments
models/pull.go diff | blob | history
options/locale/locale_en-US.ini diff | blob | history
routers/repo/pull.go diff | blob | history
templates/repo/issue/view_content/pull.tmpl diff | blob | history
Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD: https://github.com/go-gitea/gitea