Git合并：冲突我不知道如何解决

Question

我在 Git 上有一个 Django 项目

我对 Git 不太满意

我刚刚完成，提交并推送我的 feature/22 分支

我已经提交（在 git add 之后）并推送我的主人

所以我的两个分支都是最新的

现在，我想在本地将我的 master 与我的 feature/22 合并，但我有冲突

即使在提交之后，我在“取消合并路径”中有 2 个文件：

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   unblind/migrations/__pycache__/0002_auto_20200124_0904.cpython-37.pyc
        both modified:   unblind/migrations/__pycache__/0003_auto_20200124_1007.cpython-37.pyc

如果我使用推荐的命令 git add 会怎样？

为什么这两个文件没有包含在之前的 git add 中。命令？

编辑：

$ git merge feature/22
warning: Cannot merge binary files: unblind/migrations/__pycache__/0003_auto_20200124_1007.cpython-37.pyc (HEAD vs. feature/22)
warning: Cannot merge binary files: unblind/migrations/__pycache__/0002_auto_20200124_0904.cpython-37.pyc (HEAD vs. feature/22)
Auto-merging unblind/migrations/__pycache__/0003_auto_20200124_1007.cpython-37.pyc
CONFLICT (content): Merge conflict in unblind/migrations/__pycache__/0003_auto_20200124_1007.cpython-37.pyc
Auto-merging unblind/migrations/__pycache__/0002_auto_20200124_0904.cpython-37.pyc
CONFLICT (content): Merge conflict in unblind/migrations/__pycache__/0002_auto_20200124_0904.cpython-37.pyc
Removing randomization/templates/randomization/_randomisation_edit.html
Automatic merge failed; fix conflicts and then commit the result.

EDIT2：

我已经暂时解决了我的合并问题：

• git 结帐功能/22
• rm（合并 master / feature/22 时冲突中提到的所有文件
• git commit -m "delete *.pyc"
• git checkout master
• git 合并功能/22
• git push origin master

但是 .pyc 仍然被跟踪，并且在我在 master 上运行我的 django 项目之后，如果我执行 git status:

$ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   export/migrations/__pycache__/__init__.cpython-37.pyc
        modified:   parameters/migrations/__pycache__/0003_auto_20200128_1337.cpython-37.pyc
        modified:   parameters/migrations/__pycache__/0004_auto_20200129_1206.cpython-37.pyc
        modified:   parameters/migrations/__pycache__/0005_auto_20200305_0810.cpython-37.pyc
        modified:   parameters/migrations/__pycache__/0006_auto_20200305_1238.cpython-37.pyc
        modified:   parameters/migrations/__pycache__/0007_auto_20200305_1242.cpython-37.pyc
        modified:   parameters/migrations/__pycache__/0008_auto_20200305_1428.cpython-37.pyc
        modified:   pharmacy/migrations/__pycache__/0001_initial.cpython-37.pyc
        modified:   pharmacy/migrations/__pycache__/0002_auto_20200129_1206.cpython-37.pyc
        modified:   pharmacy/migrations/__pycache__/0003_auto_20200129_1434.cpython-37.pyc
        modified:   pharmacy/migrations/__pycache__/0004_auto_20200210_1750.cpython-37.pyc
        modified:   pharmacy/migrations/__pycache__/0005_historicalstock_stock.cpython-37.pyc
        modified:   pharmacy/migrations/__pycache__/0006_auto_20200218_1344.cpython-37.pyc
        modified:   pharmacy/migrations/__pycache__/0007_auto_20200218_1359.cpython-37.pyc
        modified:   pharmacy/migrations/__pycache__/0008_auto_20200218_1403.cpython-37.pyc
        modified:   pharmacy/migrations/__pycache__/0009_auto_20200218_1410.cpython-37.pyc
        modified:   pharmacy/migrations/__pycache__/0010_auto_20200302_1059.cpython-37.pyc
        modified:   pharmacy/migrations/__pycache__/__init__.cpython-37.pyc
        modified:   randomization/migrations/__pycache__/0008_auto_20200302_1059.cpython-37.pyc

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        unblind/migrations/__pycache__/

no changes added to commit (use "git add" and/or "git commit -a")

Answer 1

您可以忽略项目中的任何/__pycache__/ 文件夹。

1. 如果您还没有.gitignore，您可以在项目文件夹中创建一个：project/.gitignore。
2. 将*/__pycache__/* 放入.gitignore

Answer 2

删除那些缓存文件

rm -rf <path_of_filename>

尽量不要用

推送你的代码

 git add.

继续练习开始添加

.gitignore

在开始任何项目之前，将缓存，编译文件添加到其中。

Answer 3

将 pycache 文件存储在 git 存储库中绝不是一个好主意。 这些文件由py_compile module 在每次构建时自动生成。

您可以添加此文件来解决合并冲突，但我建议在项目的根目录下使用 .gitignore。

这是一个很好的 .gitignore 可以添加到您的项目中。