https://github.com/gitlabhq/gitlabhq/blob/master/lib/gitlab/satellite/satellite.rb#L105 - should add "force" flag here.
line delimiter normalization can create problems for satellite repos. ie. your git configuration is setup to convert crlf to lf. If this normalization occurs, that satellite repo gets into an unstable state where it tries to delete a branch that it is currently in (it fails to switch to the parking branch then tries to delete itself). Once it is in this state, all auto merge checks for that repo will hang when checking. -Xavier -- You received this message because you are subscribed to the Google Groups "GitLab" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
