我可以只合并Git中的非冲突更改吗？
[英]Can I merge only non-conflicting changes in Git?
问题描述
How can I simply (eg in one command?) merge in Git, keeping the state of conflicting files as in the current branch and without specifying each file individually as in theirs/ours options? 
我怎样才能简单地（例如在一个命令中？）在Git中合并，保持当前分支中的冲突文件的状态，而不像在他们/我们的选项中那样单独指定每个文件？
git checkout master
git merge stable --some-option-to-keep-files-?
1 个解决方案
解决方案1
4 2012-09-24 20:46:57
The merge strategy has an "ours" option which is what you want 合并策略有一个“我们的”选项，这是你想要的
git merge -s recursive -X ours remote/branch
As the manpage stresses out, this is NOT git merge -s ours. 正如manpage强调的那样，这不是我们的git merge。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.
相关问题
在后续行的无冲突更改上禁用git merge冲突 - Disable git merge conflicts on on non-conflicting changes to subsequent lines
git：自动合并与正常（非冲突）合并？ - git: Auto merging vs normal (non-conflicting) merge?
如何使用 git rebase 保留调整后的合并提交（冲突和非冲突的自动合并结果）？ - How to preserve adjusted merge commits (conflicting and non-conflicting automerge results) with git rebase?
Git rerere和解决方案涵盖非冲突文件 - Git rerere and resolution covering non-conflicting files
我如何自动合并无冲突的冲突 - How do I automerge non-conflicting conflicts
如何在替换当前文件并忽略无冲突文件的同时从git存储库中提取 - How to pull from git repository while replacing current files AND ignoring non-conflicting files
您是否检查了无冲突的automerges的结果？ - Do you examine the results of non-conflicting automerges?
git - 如何提取和合并我未提交的更改？ - git - How can I pull and merge with my uncommitted changes?
Git：如何在合并到 master 期间删除冲突更改 - Git: How can I remove conflict changes during merge into master
如何将更改合并到Git中的标签？ - How can I merge my changes to a Tag in Git?
相关标签