VS Team Explorer merge conflicts December 16, 2023 by Tarik In this case, you should Take Source. The “Source” is the develop branch and the “Target” is the feature branch.