Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix duplicated file on pull request conflicted files #7211

Merged
merged 2 commits into from Jun 15, 2019

Conversation

@lunny
Copy link
Member

commented Jun 15, 2019

Fixes #7210

@lunny lunny added this to the 1.9.0 milestone Jun 15, 2019

@codecov-io

This comment has been minimized.

Copy link

commented Jun 15, 2019

Codecov Report

Merging #7211 into master will decrease coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7211      +/-   ##
==========================================
- Coverage   41.52%   41.52%   -0.01%     
==========================================
  Files         449      449              
  Lines       61306    61313       +7     
==========================================
+ Hits        25460    25462       +2     
- Misses      32492    32497       +5     
  Partials     3354     3354
Impacted Files Coverage Δ
models/pull.go 48.73% <0%> (-0.33%) ⬇️
models/repo_list.go 73.09% <0%> (+1.01%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 94ceaf1...304e473. Read the comment docs.

@GiteaBot GiteaBot added lgtm/need 1 and removed lgtm/need 2 labels Jun 15, 2019

@GiteaBot GiteaBot added lgtm/done and removed lgtm/need 1 labels Jun 15, 2019

@zeripath zeripath merged commit 0323122 into go-gitea:master Jun 15, 2019

2 checks passed

approvals/lgtm this commit looks good
continuous-integration/drone/pr Build is passing
Details
@zeripath

This comment has been minimized.

Copy link
Contributor

commented Jun 15, 2019

Please send backport

@lunny lunny deleted the lunny:lunny/fix_duplicated_conflict_files branch Jun 15, 2019

lunny added a commit to lunny/gitea that referenced this pull request Jun 15, 2019

@lunny lunny added the backport/done label Jun 15, 2019

zeripath added a commit that referenced this pull request Jun 15, 2019

jeffliu27 added a commit to jeffliu27/gitea that referenced this pull request Jul 18, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants
You can’t perform that action at this time.