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) #7214

Merged
merged 1 commit into from
Jun 15, 2019
Merged

Fix duplicated file on pull request conflicted files (#7211) #7214

merged 1 commit into from
Jun 15, 2019

Conversation

lunny
Copy link
Member

@lunny lunny commented Jun 15, 2019

back port from #7211

@lunny lunny added the type/bug label Jun 15, 2019
@lunny lunny added this to the 1.8.3 milestone Jun 15, 2019
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label 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 7697a28 into go-gitea:release/v1.8 Jun 15, 2019
@lunny lunny deleted the lunny/fix_duplicated_conflict_files2 branch June 16, 2019 02:32
@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
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.8.3
Development

Successfully merging this pull request may close these issues.
4 participants
@lunny @techknowlogick @zeripath @GiteaBot