[英]How do i get git to generate REMOTE, LOCAL files while rebasing?
所以我有master
和feature
分支。 我做:
git checkout feature
git rebase master
我遇到合并冲突:
Unmerged paths:
(use "git reset HEAD <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified: /src/...
我运行mergetool
git mergetool
冲突令人讨厌,我的mergetool毫无帮助。 所以我需要手动解决它,所以我关闭合并工具,然后我回答:
Was the merge successful [y/n]? N
Continue merging other unresolved paths [y/n]? Y
那是唯一的冲突,所以我们退出
现在,我希望看到4个文件:带有冲突的文件周围的REMOTE,LOCAL,BASE,BACKUP,但是我看不到它们。
题:
因此事实证明git本身会生成所有这些文件,您需要做的就是终止合并过程(而不是轻轻地回答所有问题就关闭它):
Was the merge successful [y/n]?
Ctrl + C
,然后执行
git status
观察
Untracked files:
(use "git add <file>..." to include in what will be committed)
scripts/src/models/editing/main/basic-block/block-object-attribute-fields_BACKUP_9504.tsx
scripts/src/models/editing/main/basic-block/block-object-attribute-fields_BASE_9504.tsx
scripts/src/models/editing/main/basic-block/block-object-attribute-fields_LOCAL_9504.tsx
scripts/src/models/editing/main/basic-block/block-object-attribute-fields_REMOTE_9504.tsx
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.