Question

我与德国信息技术公司合并了第4页,我一度经历了这种情况。

我有一起冲突合并案。档案说, fc将冲突合并为3条不同的法典(第1条与冲突有关,中一条与冲突有关)。

当一解决第一线冲突(而不是其他冲突线)和挽救(使用4头merge的托顿)时,我就认为它增加了指数的oo,一心一意,就允许我不给我留下错误或警告,在同一个档案中解决其他冲突线。

这一问题是否与全球信息技术公司或第4页合并? i 认为GIT应当警告或错误,指出还有其他相互矛盾的线。但它只是承诺。

还有一个问题是,是否有指挥权,以便派出开发商合并某一档案? 当一把冲突合并起来时,它就会把冲突一分为二,相反,在什么地方,我可以说合并了这个选定的档案?

Answer 1

My guess: when you save file in p4merge, it happilly return with code 0, file is changed, and git assumes that conflicts were resolved. There is a config parameter mergetool.<tool>.trustExitCode (mergetool.p4merge.trustExitCode in your case), which can be set to false, so git will always ask you if merge was successfull after running git mergetool (which can be quite annoying). You also might be able to write a wrapper for p4merge which will check presence of conflict markers after running p4mege, or pre-commit hook, which rejects commits containing files containing such markers, though I ve never done something like that.
是的,你可以操作<代码>git jointtool <file>,以解决特定档案。学习更多。