Question

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

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

    private void clickToolStripMenuItem_Click(object sender, EventArgs e)
        {

            //create checklist
            CheckedListBox checkedlistbox = new CheckedListBox();
            //spawn checklist at mouse position
            checkedlistbox.Location = new Point(MousePosition.X - 400, MousePosition.Y - 200 );
            //add checkbox
            CheckBox option1 = new CheckBox();

            //checkbox propieties
            checkedlistbox.Width = 500;

            option1.Text = "option1";
            this.Controls.Add(checkedlistbox);
            checkedlistbox.Items.Add(option1);

            //test if name changes
            MessageBox.Show(option1.Text);
        }

尝试

Sub SaveOlAttachments()

Dim app As Outlook.Application
Dim msg As Outlook.MailItem
Dim att As Outlook.Attachment
Dim strFilePath As String
Dim strAttPath As String

Set app = New Outlook.Application

'path for creating msgs
strFilePath = "C:\Users\New folder\"

'path for saving attachments
strAttPath = "C:\Users\Extract\"

strFile = Dir(strFilePath & "*.msg")

Do While Len(strFile) > 0
    Set msg = app.CreateItemFromTemplate(strFilePath & strFile)
    If msg.Attachments.Count > 0 Then
         For Each att In msg.Attachments
             att.SaveAsFile strAttPath & att.Filename
         Next
    End If
    strFile = Dir
Loop

MsgBox "Task Completed", vbInformation

End Sub

我得到了

    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

Answer 1

    JsonData jsonData = addUserDto.getAddr();
    Class<?> loadClass = null;
    try {
        String packagePath = "com.demo.domain.json";
        String className = jsonData.getType();
        loadClass = Class.forName(packagePath + "." + className);
    } catch (ClassNotFoundException e) {
        System.out.println("No class found for provided jsondata type");
    }
    Object jsonAfterCast = null;
    System.out.println("loaded class " + loadClass);
    ObjectMapper objectMapper = new ObjectMapper();
    objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
    if (loadClass != null) {
        jsonAfterCast = objectMapper.convertValue(jsonData.getData(), loadClass);
        ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
        Validator validator = factory.getValidator();
        System.out.println("Validating :-\n" + validator.validate(jsonAfterCast, loadClass));
    }
    System.out.println(jsonAfterCast);

Gitlab从命令行合并合并请求，不生成任何提交（无快进）

1 个答案: