1. Bitbucket
  2. Public Issue Tracker
  3. master
  4. Issues


Issue #2798 resolved

Pull request merging failed

Georg Brandl
created an issue

I tried to merge the pull request from https://bitbucket.org/birkenfeld/pygments-main/pull-request/3/groovy-lexer with the web UI. It now says it merged in a specific revision, but this changeset does not exist.

(I subsequently pulled and merged the changes locally, so the three changesets from the fork are now anyway in the main repo.)

Comments (2)

  1. Brodie Rao

    Sorry about that, this should be fixed now.

    While making a hot fix for our in-memory merge algorithm so it'd correctly handle binary file conflicts, I did some code cleanup that inadvertently broke how we handle transactions during the pull/merge phase of a pull request. As a result, we weren't finalizing the transaction, so it got rolled back, but from the pull request's point of view everything seemed fine.

  2. Log in to comment