在重新设置基础时，如何获取git生成远程，本地文件? [英] How do i get git to generate REMOTE, LOCAL files while rebasing?

问题描述

所以我有master和feature分支.我这样做:

So I have master and feature branches. I do:

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

I run the mergetool

git mergetool

冲突是令人讨厌的，我的mergetool也无济于事.所以我需要手动解决它，所以我关闭合并工具，然后我回答:

The conflict is nasty and my mergetool is no help. So I need to resolve it manually, so I close the merge tool and I answer:

Was the merge successful [y/n]? N
Continue merging other unresolved paths [y/n]? Y

这是唯一的冲突，所以我们退出

It was the only conflict, so we exit

现在我希望看到4个文件:带有冲突的文件周围的REMOTE，LOCAL，BASE，BACKUP，但我看不到它们.

Now I expect to see 4 files: REMOTE, LOCAL, BASE, BACKUP around the file with the conflict, but I don't see them.

问题:

• 在重新定基时如何查看REMOTE LOCAL BASE和BACKUP?

推荐答案

因此git本身会生成所有这些文件，您所需要做的就是终止合并过程(而不是关闭它会轻轻回答所有问题):

so turns out git itself DOES generate all these files, all you need to do is to terminate the merge process (rather than closing it gently answering all questions):

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

这篇关于在重新设置基础时，如何获取git生成远程，本地文件?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！