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.

Sign up for GitHub

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

Jump to bottom

Fix duplicated file on pull request conflicted files #7211

Merged
merged 2 commits into from
Jun 15, 2019
Merged

Fix duplicated file on pull request conflicted files #7211

merged 2 commits into from
Jun 15, 2019

Conversation

lunny
Copy link
Member

@lunny lunny commented Jun 15, 2019 •
edited by zeripath
Loading

Fixes #7210

@lunny lunny added this to the 1.9.0 milestone Jun 15, 2019
@codecov-io
Copy link

codecov-io commented Jun 15, 2019 •
edited
Loading

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 the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 15, 2019
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jun 15, 2019
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jun 15, 2019
@zeripath zeripath merged commit 0323122 into go-gitea:master Jun 15, 2019
@zeripath
Copy link
Contributor

Please send backport

@zeripath zeripath mentioned this pull request Jun 15, 2019
Closed
@lunny lunny deleted the lunny/fix_duplicated_conflict_files branch June 15, 2019 15:50
lunny added a commit to lunny/gitea that referenced this pull request Jun 15, 2019
@lunny
fix duplicated file on pull request conflicted files (go-gitea#7211)
cb31a59
@lunny lunny mentioned this pull request Jun 15, 2019
Merged
@lunny lunny added the backport/done All backports for this PR have been created label Jun 15, 2019
zeripath pushed a commit that referenced this pull request Jun 15, 2019
@lunny @zeripath
fix duplicated file on pull request conflicted files (#7211) (#7214)
7697a28
jeffliu27 pushed a commit to jeffliu27/gitea that referenced this pull request Jul 18, 2019
@lunny @jeffliu27
fix duplicated file on pull request conflicted files (go-gitea#7211)
a2e1a2c
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@zeripath zeripath zeripath approved these changes

@techknowlogick techknowlogick techknowlogick approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.9.0
Development

Successfully merging this pull request may close these issues.

Pull request conflicted files duplicated
5 participants
@lunny @codecov-io @zeripath @techknowlogick @GiteaBot