Error during Rebase: Fast-forward merge is not possible - You have unstaged changes

Summary

  • GitLab Version 9.2.2-ee

Steps to reproduce

  1. Select "Merge commit with semi-linear history" in project settings
  2. Create conflict in master vs merge request branch
  3. Attempt to rebase

What is the current bug behavior?

Rebase fails with

1.	May 29, 2017 12:49 -> ERROR -> MergeRequests::RebaseService error (customers/xxxxx!4): Failed to rebase branch with `/opt/gitlab/embedded/bin/git pull --rebase /var/opt/gitlab/git-data/repositories/customers/ xxxxx.git master`: 
2.	May 29, 2017 12:49 -> ERROR -> MergeRequests::RebaseService error (customers/ xxxxx!4): error: cannot pull with rebase: You have unstaged changes. error: please commit or stash them.
Edited by 🤖 GitLab Bot 🤖