git - Git merge pulls extra items into merge target branch
问题描述
I have a smallish 'feature' branch, call it Quality
, and a main branch called dev
. I sometimes want to merge dev
back into Quality
, so that the differences between dev
and feature
remain minimal before it is time to merge Quality
back into dev
when I am done with Quality
.
However, if I try a merge from dev
back into Quality
using VS 2019 Team Explorer, the merge seems to pull ever every artifact in dev
that isn't in Quality
, so my merge commit is full of hundreds of Adds. Can this be avoided in Team Explorer? I would prefer to keep a visual merge rather than a Git command line merge that just marks conflicts with little arrows.
解决方案
推荐阅读
- python - 尝试使用函数创建新数据框列时出现值错误
- hadoop - 在sqoop中使用--input-fields-delimited-by?
- python - 不确定 Anaconda 是否已完全移除
- ffmpeg - 如何使用 ffmpeg/ffprobe 同时从视频中提取黑框和音量信息
- java - 通用枚举 JPA AttributeConverter 实现
- android - 尝试将地理围栏添加到 android 应用程序不断出错
- swift - 如何通过循环组合文本视图?
- mysql - 错误:使用 NodeJS 在 MySQL 中调用退出后无法将查询排入队列
- node.js - NodeJs 和 db 返回值
- ceph - 设置 Ceph rgw 用户使用限制