GitLab EE 9.4.2 - `git pull --rebase` fails

Steps to reproduce:

• Have a Merge Request with approvals required & outdated from master
• Press rebase button
• Rebase will not work (thus unable to approve&merge)
• This will appear in the logs

cc @vsizov @smcgivern

root@gitlab:/# grep -i rebaseservice /var/log/gitlab/ -R
/var/log/gitlab/gitlab-rails/githost.log:August 03, 2017 10:05 -> ERROR -> Merge
Requests::RebaseService error (group/repo!1289): Failed to rebase branch wi
th `/opt/gitlab/embedded/bin/git pull --rebase /var/opt/gitlab/git-data/reposito
ries/group/repo.git master`:
/var/log/gitlab/gitlab-rails/githost.log:August 03, 2017 10:05 -> ERROR -> Merge
Requests::RebaseService error (group/repo!1289): First, rewinding head to r
eplay your work on top of it...
/var/log/gitlab/gitlab-rails/githost.log:August 03, 2017 11:26 -> ERROR -> Merge
Requests::RebaseService error (group/repo!1289): Failed to rebase branch wi
th `/opt/gitlab/embedded/bin/git pull --rebase /var/opt/gitlab/git-data/reposito
ries/group/repo.git master`:
/var/log/gitlab/gitlab-rails/githost.log:August 03, 2017 11:26 -> ERROR -> Merge
Requests::RebaseService error (group/repo!1289): First, rewinding head to r
eplay your work on top of it...
root@gitlab:/#

From https://gitlab.com/gitlab-org/gitlab-ee/issues/2979#note_36656234

@chauffer thanks for creating this issue. The output of git pull --rebase should be in the same log file, but may not be prefixed with the MergeRequests::RebaseService prefix. Can you try to find that, please?

added Discussion ~1052112 ~155976 labels

August 03, 2017 11:48 -> ERROR -> MergeRequests::RebaseService error (group/project!44): Failed to rebase branch with `/opt/gitlab/embedded/bin/git pull --rebase /var/opt/gitlab/git-data/repositories/group/project.git master`:
August 03, 2017 11:48 -> ERROR -> MergeRequests::RebaseService error (group/project!44): First, rewinding head to replay your work on top of it...
Applying: [commitmessage]
Using index info to reconstruct a base tree...
M	README.md
Falling back to patching base and 3-way merge...
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Patch failed at 0001 [commitmessage]
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

From /var/opt/gitlab/git-data/repositories/group/project
 * branch            master     -> FETCH_HEAD
error: Failed to merge in the changes.

I haven't bene able to see why the one without conflicts wasn't rebasable, due to logrotate cutting the file, but one of them was indeed conflicting. This should probably show that the rebase is not possible and to do it manually locally, then. :D

@chauffer thanks!

I agree that we should show that, and we are working on it: https://gitlab.com/gitlab-org/gitlab-ee/issues/1774

I will close this issue as it looks like this can be described by that one

closed