This is a series of articles related to Source Control or Version Control issues, from a stand-alone app, such as MS SourceSafe, to a Server app, such as MS TFS (Team Foundation Server), to web services, such as GitHub, AWS, and MS Azure DevOps. We have tried to categorize this series of articles as Source Control or Version Control, but this site does not have these categories. So, we put the articles in the DevOps category, as explained in the Wiki:
DevOps is a set of practices that combines software development (Dev) and IT operations (Ops). It aims to shorten the systems development life cycle and provide continuous delivery with high software quality.[1] DevOps complements Agile software development; several DevOps aspects came from the Agile methodology.
The structure of this article series will cover:
- Stand Alone App
- MS Source Safe
- Server App
- MS TFS (Team Foundation Server)
- Online (Cloud) Centralized Service
- MS Azure: DevOps
- Boards
- Repos
- Pipelines
- Test Plans
- Artifacts
- GitHub
- AWS GitHub Enterprise
- MS Azure: DevOps
- Distributed App
- Git
Because these are huge topics, I will not go through them step by step. Instead, each section will be relatively independent and become a reading unit.
- Source Control (1), MS Source Safe --- Stand Alone App
- Source Control (2), MS TFS --- Centralized Server App
- Source Control (2-1), TFS --- Comparison
- Source Control (2-2), TFS --- Merge
- Source Control (2-2), TFS --- Shelving
- Source Control (3), MS Azure DevOps (GitHub, Jira) --- Centralized Service
- Source Control (4), Git --- Distributed App
- Source Control (4-1), Git --- Configuration
- Source Control (4-2), Git --- Configured to Connect to DevOps and GitHub
- Source Control (4-3), Git --- Cherry Pick in Visual Studio
- Source Control (4-4), Git --- Recover Git Tree: Reflog/Reset
- Source Control (4-5), Git --- Recover Deleted Branch
- Source Control (4-6), Git --- Revert
- Source Control (4-7), Git --- Get Specific Version or Commit
- Source Control (4-8), Git --- Get Specific Version or Commit in practice
- Source Control (4-9), Git --- Merge: Fetch, Pull, Push and Sync
- Source Control (5), GitHub access (setup connection)
- Source Control (6), DevOps access (setup connection)
- Source Control (7), GitLab access (setup connection and Clone to Local)
- Source Control (8), Git, Azure Repos, and Visual Studio (Interaction)
- Source Control (9), Push into Git Hub and DevOps
- Source Control (10), Git Hub, DevOps Publish
Introduction
We have discussed Merge for TFS in the article, Source Control (2-2), TFS --- Merge. We also discuss a bit about Git Merge in the article, Source Control (4.9), Git --- Merge: Fetch, Pull, Push, and Sync. Now, I will discuss more about Git Merge,
- On the Server Side
- MS DevOps
- MS GitHub
- GitLab
- In Client Side
- in Visual Studio
- by Git Prompt Command
I should emphasize here TFS Merge and Git Merge are quite different concepts. While TFS is server-side centralized software, a client-side interface, such as Visual Studio, is just a dummy interface that is synchronous with the server as an input/output interface. Git is a client-side or distributed Software on the client side that is independent software; it can be an independent system working in the client machine, the conversation to the Server, just push/pull the result to/from the Server to make client and Server synchronously.
In IDE, such as Visual Studio, you must choose either TFS or Git.
Menu Bar => Tools => Options => Source Control => Plug-in Selections, got:
Git:
TFS:
Compared to TFS Merge, Git Merge has more choices, such as from Merge Strategies in Git - GeeksforGeeks, that
- Fast Forward
- Recursive
- Ours
- Octopus
- Resolve
- Subtree
But we will not discuss that kind of complex types; we will only discuss the basic types, say, most often happening in different Source Control Servers,
- Merge in Servers
- Merge in DevOps
- Merge (no fast forward)
- Squash Merge
- Rebase Merge
- Semi-Linear Merge
- Merge in GitHub
- Merge (no fast forward)
- Squash Merge
- Rebase Merge
- Merge in GitLab
- Merge (no fast forward)
- Squash Merge
- Merge in DevOps
- Merge in Client
- Merge in Visual Studio
- Merge (no fast forward)
- Squash Merge
- Rebase Merge
- Merge in Git --- all types of merges, but we only discuss
- Merge (no fast forward)
- Merge Fast Forward
- Squash Merge
- Rebase Merge
- Semi-Linear Merge
- Merge (no fast forward)
- Merge in Visual Studio
We will discuss the contents of this article
- A - Introduction
- B - Merge in Visual Studio
- Merge (no fast forward)
- Rebase and Merge
- Squash Commits
- C - Merge by Git Command
- Merge (no fast forward): merge from the feature branch to the master branch.
- Merge (Fast forward): merge from the feature branch to the master branch
- Rebase Merge: Rebase feature branch onto the master branch
- Squash Merge: Squash two or more commits into one
B - Merge in Visual Studio
In Visual Studio Integrated Development Environment, we may have the following 3 ways to merge.
- Merge (no fast forward): merge from the feature branch to the master branch
- Rebase Merge: Rebase feature branch onto the master branch
- Squash Merge: Squash two or more commits into one
Test Program:
For better understanding, I make this testing program in Visual Studio.
Master Branch

Feature Branch

















































Join the conversation! Your thoughts help the community grow.