To do that, you will have to select root Git Repositories node and do the same. Optionally, you can also enable this option for all the Git repositories you create. Applies to files, folders, branches, and tags. Finally enable the option which says Block pushes from introducing names that differ only in case to avoid case-sensitivity conflicts. Go to your Project settings and Repositories page. Okay, you solved the problem, but how will you ensure that it does not happen again? Well, Azure DevOps has the setting to the rescue. Once you clean all the conflicting branches, retrigger the build and it should succeed now. In our case it was Users/Sai/local.ĭo the same for other branches if you have any. Once done, go ahead and delete the branch causing conflict. Here I am creating the new branch from Users/Sai/local to users/Sai/local, so that a new branch with the same commit is available at the new location. In the dialog that opens, enter the name for the new branch. Navigate to the branch you want to rename and open the context menu on the latest commit of that branch and click New branch. Head over to the Repos hub and Branches page. Fortunately, Azure DevOps makes it super easy to do this by just using the portal. Solution is to clean (remove or rename) the branches which just differ in case.
#Azure devops git delete branch windows#
However, when agent tried to clone (Git uses file-system to store refs) the branches on a Windows machines, they conflict and hence the failure. So, the issue was that, while Git (and Azure DevOps) allowed branch names to be created that only differ in case (treating them as separate refs). On Windows and macOS you will not be allowed to create files with such file names. This means that on Linux machines a repo which contain readme.md and Readme.md are both valid and hence co-exist. You can not delete the commit history from a branch, but you can create a new branch (without history because is new), push the files to the new branch and. However, Git built originally for Linux and is case-sensitive. This meant, the agent machine file-system is case-insensitive. The build was happening on a Windows on-premises agent. To disconnect a sandbox from a Blue Canvas branch or remove a branch for a deleted sandbox: Click the avatar in the top right of the screen.Go to Settings. For example, take a look at users/Sai and Users/Sai/local branches - notice letter u has different case in those branch names. Looking at the branches it became clear that there are few branches which just differ in the letter case. Issues 1. Issueįrom the logs it was pretty evident that it is to do with the branches.
#Azure devops git delete branch how to#
In this post we will see what was the root cause and how to fix it. Looking at the logs the error wasĮrror: cannot lock ref 'refs/remotes/origin/': there is a non-empty directory '.git/refs/remotes/origin/' blocking reference 'refs/remotes/origin/'
For one of our clients, we noticed their builds started failing at the checkout step.
0 kommentar(er)
