9.4.1; Can't merge. Urgent bug.

We have upgraded to 9.4.1 and have a setup where we have

• 1 approver needed
• branch must be up to date with master

We have a branch of work. As far as we can tell, there is no reason it should not be merged in.

• It has been approved
• It is up to date; we can check the commit hashes in the 2 branches. When we try to update branch our local machine, it tells us it is up to date.

We have a problem that occurs sometimes but not all the time - we have yet to work out any pattern to that.

However, the merge button is not active.

Oddly, the JSON being returned specifically says it can be. This is after pressing the rebase button:

This is what we see in our console:

"can_be_merged":true

and

"merge_status":"can_be_merged"

Any ideas? Thanks

added SP2 bug customer labels

Just noticed:

"should_be_rebased": true 

is set in our JSON at the same time as

"can_be_merged":true

The merge strategy on this repo is "Merge commit with semi-linear history" BTW

We have changed our merge method to "Merge commit" to get around this problem for now as we must have a solution; but if anyone can shed any light on this that would be appreciated.

added Discussion label

@victorwu any ideas on this?

@smcgivern : Could you take a look at this?

@JamesValleyT hi! Sorry about this issue

This is a duplicate of https://gitlab.com/gitlab-org/gitlab-ee/issues/2979, which will be fixed in 9.4.2. You may also be able to work around this by closing and reopening the MR, if the rebase has completed - the problem is that rebasing works, but then the MR doesn't update with the results of that push.

@ckatanda @victorwu I mentioned this on Slack also

closed

Thankyou!