Question

我们最近已使用git-p4从p4迁移到git

我们已经运行

git-p4 clone //test/path1/...@all
#and incrementally started doing imports using 

git p4 rebase //test/path1/...@all

它一直运行良好，但后来很少有工程师开始在p4和git repo中添加和删除文件test.sh，然后git-p4 rebase开始失败。

首先，倒带头在其上回放您的工作... 申请：第一次提交应用：创建jenkins-git-build.sh 使用索引信息重建基础树...

<stdin>:140: trailing whitespace.
##                                                                      ##  
<stdin>:165: trailing whitespace.
##                                                                      ##  
<stdin>:254: trailing whitespace.
##                                                                      ##  
<stdin>:328: trailing whitespace.
##                                                                      ##  
<stdin>:351: trailing whitespace.
##                                                                      ##  
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging components/tools/bin/jenkins-git-build.sh
CONFLICT (add/add): Merge conflict in components/tools/bin/jenkins-git-build.sh
Failed to merge in the changes.
Patch failed at 0002 Create jenkins-git-build.sh
The copy of the patch that failed is found in:
   /gitdata/path1/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

Traceback (most recent call last):
  File "/usr/local/libexec/git-core/git-p4", line 3297, in <module>
    main()
  File "/usr/local/libexec/git-core/git-p4", line 3291, in main
    if not cmd.run(args):
  File "/usr/local/libexec/git-core/git-p4", line 3074, in run
    return self.rebase()
  File "/usr/local/libexec/git-core/git-p4", line 3091, in rebase
    system("git rebase %s" % upstream)
  File "/usr/local/libexec/git-core/git-p4", line 198, in system
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command 'git rebase remotes/p4/master' returned non-zero exit status 1

我已经解决了冲突并尝试了跳过选项，但它仍然不断抱怨每个增量提交..

warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging components/tools/bin/jenkins-git-build.sh
CONFLICT (add/add): Merge conflict in components/tools/bin/jenkins-git-build.sh
Failed to merge in the changes.
Patch failed at 0006 Create jenkins-git-build.sh

如果我继续跳过150次以上，则表示已完成。

但是我想永远解决合并问题，并继续平稳进行增量调整。有帮助吗？

我尝试按照建议的git p4 rebase attempts to reapply past commits解决冲突并进行更改，但这没有帮助。

Git P4重新设置因三向合并问题而失败

0 个答案: