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

Merged

Conversation

@lunny
Copy link
Member

commented Jun 15, 2019

back port from #7211

@lunny lunny added the kind/bug label Jun 15, 2019

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

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

@zeripath zeripath merged commit 7697a28 into go-gitea:release/v1.8 Jun 15, 2019

2 checks passed

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

@lunny lunny deleted the lunny:lunny/fix_duplicated_conflict_files2 branch Jun 16, 2019

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