Skip to content

Fix for #522: NPE was preventing the MergeView from populating after entering a conflicted state

Bitbucket Importer requested to merge bitbucket/merged-pr-46 into branch/default

Created originally on Bitbucket by monotoli (Andy Lee)

Was already merged in Bitbucket before import, marked as merged by the import user

I've been running with this fix for 2 weeks or so and everything seems to work pretty well, although I'm not sure if it is really the correct way to fix the problem or not.

Merge request reports