我有两个分支master和i1：

分支主：

int main() {
    std::cout << "Hello World!";
    std::cout << "1";
    std::cout << "3";
    std::cout << "5";
    return 0;
}

分支机构i1：

int main() {
    std::cout << "Hello World!";
    std::cout << "1";
    std::cout << "2";
    std::cout << "4";
    std::cout << "6";
    return 0;
}

将i1合并到master时发生冲突：

int main() {
    std::cout << "Hello World!";
    std::cout << "1";
<<<<<<< HEAD
    std::cout << "2";
    std::cout << "4";
    std::cout << "6";
=======
    std::cout << "3";
    std::cout << "5";
>>>>>>> master
    return 0;
}

每次提交都是按以下顺序完成的：

    std::cout << "1";
commit master
    std::cout << "2";
commit i1
    std::cout << "3";
commit master
    std::cout << "4";
commit i1
    std::cout << "5";
commit master
    std::cout << "6";
commit i1

我确实与Meld合并：

int main() {
    std::cout << "Hello World!";
    std::cout << "1";
    std::cout << "2";
    std::cout << "4";
    std::cout << "6";
    std::cout << "3";
    std::cout << "5";
    return 0;
}

是否可以要求合并工具根据提交历史自动创建合并：

int main() {
    std::cout << "Hello World!";
    std::cout << "1";
    std::cout << "2";
    std::cout << "3";
    std::cout << "4";
    std::cout << "5";
    std::cout << "6";
    return 0;
}