Implementing Azure DevOps Solutions

Git

A merge using Git can be performed by switching to the target branch and then merging all of the changes from the source branch. If there are conflicting changes between the branches, you must resolve those just as you would when fetching new changes from the server. After merging the changes from the source branch and resolving any changes, you can commit the changes. This will result in a merge commit, which you push to the remote just as any change.

This can be done using the visual interface of Visual Studio or VS Code, but also using the following sequence of commands:

git checkout targetBranchgit merge sourceBranch

If there are any conflicts, you have to resolve these at this point. Otherwise, you cannot continue:

git commit -m ...