How to resolve merge conflict in pull request in VSTS?

Update Microsoft just added browser based merges. This may get you out of a pickle for small conflicts. And offers improved visualizations of the different scenarios as of Sprint 150. For more complex situations: You have two options to resolve the conflict, reverse-integrate the changes from the target branch (which creates additional merge commits), or … Read more

How to change branch name in Azure DevOps

Unfortunately, you are not able to rename a branch. However, you can create a new branch from the branch which you want to rename then you can delete that branch. As per the design, the rename of azure repo branches is not implemented. You can see this existing similar thread Microsoft’s documentation page “Rename old … Read more

How can I change the default credentials used to connect to Visual Studio Online (TFSPreview) when loading Visual Studio up?

I had a very similiar problem as I was not able to connect to TFS with my own credentials. Turned out that the user who had created the image (I was using Hyper-V) stored his account in Credential Manager. There was no way to change this in Visual Studio. To solve the issue, I opened … Read more

Azure DevOps – compare two commits right in the web UI?

If you go to the list of branches for a repository, you can click on … (More Actions) on one of the branches and choose Compare branches This will take you to a URL in the form: https://dev.azure.com/{organisation}/{project}/_git/{repository}/branches?baseVersion=GB{baseBranch}&targetVersion=GB{targetBranch}&_a=files You can then change the baseVersion and targetVersion parameters in the query string. These can take the … Read more