Merge request stuck on manual resolution after a fail on a merge request
Created by: nprudhomme
Gitlab version 5.0 if a merge request failed the auto merge test (because there is a need of manual merge), all future merge request (that does not need manual merge) failed the test because the gitolite-satellite matching repo is in rebase mode as shown in the githost.log and it seems that the repo never came back to a stable state.
From githost.log :
April 09, 2013 15:47 -> ERROR -> Command failed [1]: /usr/bin/git --git-dir=/home/git/gitlab-satellites/roy/test/.git pull --no-ff origin feature-two
From /home/git/repositories/roy/test
* branch feature-two -> FETCH_HEAD
It seems that there is already a rebase-apply directory, and
I wonder if you are in the middle of another rebase. If that is the
case, please try
git rebase (--continue | --abort | --skip)
If that is not the case, please
rm -fr /home/git/gitlab-satellites/roy/test/.git/rebase-apply
and run me again. I am stopping in case you still have something
valuable there.