Skip to content

Show conflicted files on pull request ui. #887

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
Closed
lunny opened this issue Feb 10, 2017 · 3 comments · Fixed by #5951
Closed

Show conflicted files on pull request ui. #887

lunny opened this issue Feb 10, 2017 · 3 comments · Fixed by #5951
Labels
issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented type/bug
Milestone
1.8.0

Comments

@lunny
Copy link
Member

lunny commented Feb 10, 2017 •
edited
Loading

Currently when a PR is creating, it will return 500 if there are some conflicts. It's not very friendly UI.
@lunny lunny added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Feb 10, 2017
@lunny lunny added this to the 1.2.0 milestone Feb 10, 2017
@tboerger tboerger added type/bug and removed type/feature Completely new functionality. Can only be merged if feature freeze is not active. labels Feb 10, 2017
@tboerger
Copy link
Member

If it displays a 500 error page it's a bug and not a feature :)

@lunny lunny modified the milestones: 1.x.x, 1.2.0 Apr 27, 2017
@stale
Copy link

stale bot commented Jan 7, 2019

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 weeks. Thank you for your contributions.

@stale stale bot added the issue/stale label Jan 7, 2019
@adelowo
Copy link
Member

adelowo commented Feb 4, 2019

Un-stale

@techknowlogick techknowlogick added issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented and removed issue/stale labels Feb 4, 2019
@lunny lunny mentioned this issue Feb 4, 2019
Merged
@lunny lunny modified the milestones: 1.x.x, 1.8.0 Feb 4, 2019
@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.
Assignees
No one assigned
Labels
issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented type/bug
Projects
None yet
Milestone
1.8.0
Development

Successfully merging a pull request may close this issue.

Pull request conflict files detection lunny/gitea
4 participants
@lunny @tboerger @techknowlogick @adelowo