通过rebase,解决gitlab提示的pipeline failed

  • 之前提交的MQ,提示Pipeline failed:

gitlab提交MQ提示Pipeline failed的解决办法_pipeline:failed_柳鲲鹏的博客-CSDN博客

  • 又报错,给的提示:

本以为万事大吉。结果发现自己的库也提示有问题。按照上文的办法修改之后还是不对。这就奇怪了。于是就在提交中询问了一下,得到如下答复:

复制代码
Assuming that you are on your local branch 'quantum6-bitmap-italic', you could do something like the following (untested):

git checkout master
git fetch upstream
git merge upstream/master
git checkout quantum6-bitmap-italic
git rebase master
git push -f

I guess that the git rebase master step will need some manual work.
  • rebase报错:

大意应该是两个库有关系,结果又有差异。于是操作了一番,报错:

复制代码
$ git rebase master
Auto-merging src/base/ftsynth.c
Auto-merging src/cff/cffload.c
Auto-merging src/cff/cffparse.c
CONFLICT (content): Merge conflict in src/cff/cffparse.c
Auto-merging src/cff/cffparse.h
Auto-merging src/gzip/rules.mk
CONFLICT (content): Merge conflict in src/gzip/rules.mk
Auto-merging src/sfnt/sfwoff2.c
Auto-merging src/truetype/ttgload.c
CONFLICT (content): Merge conflict in src/truetype/ttgload.c
error: could not apply 6b296c0a6... Add a feature, support to slant a bitmap glyph
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 6b296c0a6... Add a feature, support to slant a bitmap glyph

到了rebase出错了,说是文件冲突。我就糊涂了:我确认这些文件是完全一样的,怎么就冲突了?猜测是更新时的不同历史造成。这怎么办?

  • rebase --skip

看到之后的hint,干脆使用了--skip:

复制代码
$ git rebase --skip
dropping 8d0cadc28ed1b7ff308a0a6db08ee5c771696e8c update to latest -- patch contents already upstream
Successfully rebased and updated refs/heads/quantum6-bitmap-italic.

$ git push -f
warning: redirecting to https://gitlab.freedesktop.org/quantum6/freetype.git/
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
remote:
remote: View merge request for quantum6-bitmap-italic:
remote:   https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/269
remote:
To https://gitlab.freedesktop.org/quantum6/freetype
 + 8d0cadc28...d366050b9 quantum6-bitmap-italic -> quantum6-bitmap-italic (forced update)

到了这里,看起来已经解决了。

相关推荐
jasnet_u15 小时前
如何重置Gitlab的root用户密码
gitlab
全栈工程师修炼指南1 天前
告别手动构建!Jenkins 与 Gitlab 完美协作,根据参数自动化触发CI/CD流水线实践
运维·ci/cd·自动化·gitlab·jenkins
xiaok3 天前
分支管理提交代码
git·gitlab·github
*老工具人了*4 天前
Terraform整合到GitLab+Jenkins工具链
gitlab·jenkins·terraform
走上未曾设想的道路5 天前
中标麒麟7.4为gitlab添加Registry
gitlab
韩zj5 天前
docker部署Gitlab社区版,步骤以及外网访问出现502的解决方式
docker·容器·gitlab
走上未曾设想的道路5 天前
gitlab流水线与k8s集群的联通
kubernetes·gitlab
走上未曾设想的道路5 天前
中标麒麟7.4部署gitlab-runner
gitlab
xiaok6 天前
把代码上传到gitee的时候,怎么忽略node_modules文件夹
git·gitlab·github
deeper_wind6 天前
OpenEuler部署gitlab(小白的“升级打怪”成长之路)
gitlab