首页 > 解决方案 > 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.

标签: gitvisual-studiomergevisual-studio-2019team-explorer

解决方案


推荐阅读