本文介绍了Git pull与章鱼策略产生冲突的处理方法，对大家解决问题具有一定的参考价值，需要的朋友们下面随着小编来一起学习吧！
问题描述
最近当我在主分支中运行
最近当我在主分支中运行
您应该可以通过 code>工作流程转换为 git fetch 工作流程。
fetch 更新远程分支指针（例如 origin / master ），但不会自动合并本地分支（例如 master ）。然后，您可以使用 gitk --all 来直观比较分支， git diff origin / master 以查看终端等等。
一旦你满意并希望合并你的上游改变，你所需要做的就是合并（例如 git merge origin / master 来自 master 分支）。通常，。
Lately when I run git pull in my master branch it occasionally gives the following merge error:
Trying simple merge with 7ff9b5... Trying simple merge with 6872cd... Simple merge did not work, trying automatic merge. Auto-merging file.txt ERROR: content conflict in file.txt fatal: merge program failed Automated merge did not work. Should not be doing an Octopus. Merge with strategy octopus failed.
However after this merge attempt there are files that aren't even in the master branch.I can fix this issue using git reset and pulling again but I was wondering where this head or commits where coming from how can I find this? I tried looking in gitk and checking the local GitLab servers but I couldn't find anything.
You should be able to see an individual file's history with git log <filename>. This may help to identify your mystery files.
For conflicts, the source of the conflict should be shown with the conflict markers:
<<<<<<< HEAD:filename ... ======= ... >>>>>>> abcd123:filename
It may also help to switch from a git pull workflow to a git fetch workflow.
fetch updates your remote branch pointer (e.g. origin/master) but does not automatically merge your local branch (e.g. master). You can then use gitk --all to visually compare the branches, git diff origin/master to view changes in the terminal, etc.
Once you are satisfied and want to incorporate your upstream changes, all you need to do is merge (e.g. git merge origin/master from the master branch). Generally, git pull is git fetch followed by git merge.
这篇关于Git pull与章鱼策略产生冲突的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持！