如何将第三方VSTS Git仓库合并至我方控制的VSTS Git仓库？

Hey there! Since your team is more accustomed to TFS and new to Git, let’s break this down into clear, actionable steps that map to concepts you already know, to make the merge process smooth:

1. First, Align on Your Merge Goal #

Start by clarifying exactly what you need to merge—this will shape your next steps:

• Are you merging the migrated third-party repository into an existing Git repo in your VSTS account?
• Or are you looking to consolidate branches within the migrated repo itself (like merging their development work into your team’s main branch)?

We’ll focus on the most common scenario: integrating the migrated third-party code into your team’s existing codebase.

2. Prep Your Local Environment (Git ↔ TFS Analogies) #

Think of Git’s local setup like configuring a TFS workspace:

• Open Git Bash, your terminal, or use VSTS’s built-in web terminal.
• If you’re merging into an existing repo:
  1. Navigate to your local copy of your team’s repo (like opening your TFS workspace folder).
  2. Add the migrated third-party repo as a "remote" (think of this as linking to another TFS project’s source control):

     git remote add third-party https://your-vsts-account.visualstudio.com/YourProject/_git/MigratedRepo
     

  3. Pull all content from the migrated repo (similar to "Get Latest" from another TFS repo):

     git fetch third-party
     

• If you’re working directly with the migrated repo, just clone it to your local machine first:

  git clone https://your-vsts-account.visualstudio.com/YourProject/_git/MigratedRepo
  

3. Run the Merge & Resolve Conflicts #

Git handles merging differently than TFS, but the core idea is the same: combining code changes. Here’s how to do it:

1. Check out your target branch (e.g., main—this is like switching to your TFS main branch):

   git checkout main
   

2. Start the merge with the third-party’s branch (replace third-party/main with their actual branch name if it’s different):

   git merge third-party/main
   

Handling Merge Conflicts (The Git Version of TFS’s "Resolve Conflicts") #

If Git flags conflicts (when the same code lines were changed in both repos), don’t panic—here’s how to fix them:

• Git will list which files have conflicts. Open those files in your code editor; you’ll see markers like this:

  <<<<<<< HEAD
  Your team’s code here
  =======
  Third-party’s code here
  >>>>>>> third-party/main
  

• Edit the file to keep the correct code (collaborate with your team or reference the third-party’s docs if unsure).
• Once fixed, stage the file (like checking in a resolved conflict in TFS):

  git add path/to/conflicted-file.cs
  

• Continue the merge:

  git merge --continue
  

• If you need to start over, run git merge --abort to undo the merge attempt.

4. Push Merged Changes Back to VSTS #

Once the merge is done locally, push the changes to your VSTS repo (like checking in your resolved changes to TFS):

git push origin main

5. Post-Merge Tips for Your TFS-Familiar Team #

To help your team adjust:

• Think of git pull as TFS’s "Get Latest" (it combines fetching updates and merging them into your local branch).
• Use VSTS’s web interface for pull requests before merging—this mirrors TFS’s code review workflow.
• If you’re still using TFS alongside Git, you can use VSTS’s built-in sync tools to keep them aligned temporarily, but transitioning fully to Git will simplify long-term workflows.

Bonus: Validate Your Conversion Rules #

You mentioned configuring conversion rules—before finalizing the merge, double-check that those rules (like file renames, namespace adjustments, or history mappings) are applied correctly in the merged code. This ensures the migrated content fits seamlessly with your team’s existing standards.

内容的提问来源于stack exchange，提问作者JGilmartin