Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • G gitlabhq1
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 21
    • Issues 21
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 12
    • Merge requests 12
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Infrastructure Registry
  • Analytics
    • Analytics
    • CI/CD
    • Repository
    • Value stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • gpt
  • large_projects
  • gitlabhq1
  • Issues
  • #3560

Closed
Open
Created Apr 10, 2013 by Administrator@rootOwner

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. 
Assignee
Assign to
Time tracking