我有一个存放在Git上的Django项目。
我对Git不太熟悉。
我刚刚完成了我的feature/22分支并进行了提交和推送。
我已经提交(使用git add .命令)并推送我的master分支。
所以我的两个分支都是最新的。
现在,我想在本地将我的master分支与我的feature/22分支合并,但我遇到了冲突。
即使在提交后,我也有2个“未合并路径”的文件。
我对Git不太熟悉。
我刚刚完成了我的feature/22分支并进行了提交和推送。
我已经提交(使用git add .命令)并推送我的master分支。
所以我的两个分支都是最新的。
现在,我想在本地将我的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.
编辑2:
我已经暂时解决了我的合并问题:
- git checkout feature/22
- rm(删除主分支/feature/22合并时提到的所有文件)
- git commit -m“delete *.pyc”
- git checkout master
- git merge feature/22
- git push origin master
但是.pyc仍然被跟踪,在在主分支上运行我的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")