gogs: Pull request patch conflict detection isn't working with Git localization

  • Gogs version (or commit ref): Gogs Version: 0.10.8.0307 (installed via Packager.io)
  • Git version: 2.1.4
  • Operating system: Debian Jessie
  • Database (use [x]):
    • PostgreSQL
    • MySQL
    • MSSQL
    • SQLite
  • Can you reproduce the bug at https://try.gogs.io:
    • Yes (provide example URL)
    • No
    • Not relevant
  • Log gist (usually found in log/gogs.log):

Description

When creating pull-requests, they are checked ONCE if a merge would work. This makes some trouble when having concurrent pull-requests.

When a second pull-request gets merged before the first one, and the second one contains changes which are incompatible with the first one, we only see a 500 error page, while the logs are saying “merge conflict”, but this is not visible inside the PR-page nor the recieved 500 error page.

It would be nice if this can be re-evaluated when clicking on a “reanalyse/recheck”-button, or even when opening the PR-page (maybe in addition being configurable). Or maybe it is possible to schedule this as some cron-task which re-validates the merge-ability of the open pull-requests?!

Additional Note: maybe the issue-template should include the way how GOGS was installed (via source or binary from packager.io and such methods)

About this issue

  • Original URL
  • State: closed
  • Created 7 years ago
  • Comments: 19 (19 by maintainers)

Commits related to this issue

Most upvoted comments

Just one note here: I can’t reproduce that error with current develop-branch 😉 seems that it works now

You’re right, only 128 is fixed, basically when there is an error, should consider as conflict.

Yes, of course!

Basically what I need is the exact error message so I’m able detect such cases and make Gogs response better other than 500.