Gitlab从命令行合并合并请求，不生成任何提交（无快进） [英] Gitlab merge a merge request from command line not generating any commit(no fast forward)

问题描述

我正在尝试从命令行手动合并合并请求。

I am trying to Merge a Merge Request manually from command line.

在Gitlab的合并窗口中，已经有一些代码愿意这样做。每当我合并来自Gitlab网站的请求时，它都会生成一个合并提交，称为-no-ff 提交。但是，当我尝试手动执行此操作时，尽管我在命令行中指定了--no-ff选项，但它不会生成任何额外的提交。有什么建议么？我已经尝试过使用commit amend选项。

In the merge window of Gitlab, there is already some codes are present to do that. Whenever I merge a request from the Gitlab website, it generates a merge commit, which is known as --no-ff commit. But when I am trying to do that manually, it is not generating any extra commit although I have specified the --no-ff option in command line. Any suggestions? I have already tried with the commit amend option as well.

    git fetch <Fork_Repo_URL> <Fork_Repo_Branch>
    git checkout -b <Branch_Name> FETCH_HEAD

    git fetch origin
    git checkout origin/master
    git merge --no-ff <Remote_Name>-<Branch_Name>

    git push origin master    

尝试

git log --oneline --decorate --all --graph

我正在

* dba92a6 (origin/falcondev, central/merge-requests/21, falcondev) check again with log
*   fdc761e (HEAD -> central/falcondev) Merge remote-tracking branch 'central/merge-requests/20' into central/falcondev
|\
| * f6c3a9b (central/merge-requests/20, central/falcondev) one more time
|/
* 1e5a6b0 trying with pull
*   d7a3fd9 Merge branch 'sourodeep.c/merge' into central/falcondev
|\
| * 67d1ee8 (central/merge-requests/19, sourodeep.c/merge) new no work
|/
*   078a128 Merge remote-tracking branch 'origin/falcondev' into central/falcondev
:...skipping...
* dba92a6 (origin/falcondev, central/merge-requests/21, falcondev) check again with log
*   fdc761e (HEAD -> central/falcondev) Merge remote-tracking branch 'central/merge-requests/20' into central/falcondev
|\
| * f6c3a9b (central/merge-requests/20, central/falcondev) one more time
|/
* 1e5a6b0 trying with pull
*   d7a3fd9 Merge branch 'sourodeep.c/merge' into central/falcondev
|\
| * 67d1ee8 (central/merge-requests/19, sourodeep.c/merge) new no work
|/
*   078a128 Merge remote-tracking branch 'origin/falcondev' into central/falcondev
|\
| * 7910f7e (central/merge-requests/18) from forked try
|/
*   e757ac2 Merge remote-tracking branch 'origin/merge-requests/17' into falcondev
|\
| * 0f09a9e (central/merge-requests/17) new approach
|/
* 2fa49fb check autonomous commit
*   226c1e9 Merge branch 'falcondev' into 'falcondev'
|\
| * f89bb8a (central/merge-requests/16) check online merge
|/
* 2d3def9 (central/merge-requests/15) no fail
* 8daf9c6 (central/merge-requests/14) success pls
* 64afe76 (central/merge-requests/13) Add one more commit
* 8d23993 (central/merge-requests/12) readme md merge
* 2053107 (central/merge-requests/11) check merge commit
* d6a2590 (central/merge-requests/10) check merge commit
* cb85533 (central/merge-requests/9, central/merge-requests/8, sourodeep.c/dummy_testing-falcondev) new change
* 8c27c2d (central/merge-requests/7) changes to merge
* bebf815 (central/merge-requests/6) Merge
* 33d4f61 (central/merge-requests/5, central/merge-requests/4, central/merge-requests/3) Again change
* 0d23cd4 (central/merge-requests/2) Update README.md
| * 3d8c3af (origin/master, origin/HEAD, central/merge-requests/1, master) Update README.md

推荐答案

git checkout falcondev
git pull central/falcondev
git merge --no-ff origin/falcondev

这篇关于Gitlab从命令行合并合并请求，不生成任何提交（无快进）的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！