git - Scrum Bug

git

A collection of 20 posts

Tips & tricks: Git under WSL and windows

Tips & tricks: Git under WSL and windows

Since the introduction of WSL I've started to rely on it more and more, but there are still a few quirks when dealing with multiple environments that access the same repo on disk.

Installing git-filter-repo on windows

Installing git-filter-repo on windows

I've been trying to get git-filter-repo to work on Windows and WSL today and it's been quite a struggle. The docs are pretty limited and call out I may have to update some values in the script itself to make things work. But doesn't spell out what to fix and

Use Visual Studio 2022 as merge tool in Tower

Use Visual Studio 2022 as merge tool in Tower

Tower recently released a major upgrade of it's already outstanding Git Client. Microsoft shipped Visual Studio 2022 not too long ago either. This is how you integrate the two.

Can't push to GitHub "Refusing to allow an OAuth App to create or update workflow without workflow scope"

Can't push to GitHub "Refusing to allow an OAuth App to create or update workflow without workflow scope"

When any of your commits contain a new or updated GitHub Action, you need to have the `workflow` scope to push these changes. Git Credential Manager for Windows doesn't request this.

Rename your master branch in Azure Repos

Rename your master branch in Azure Repos

Renaming your master branch in Azure Repos could be as simple as a few clicks. But if you have complex policies or permissions in place, it may be a little more work. To rename your master branch you have to create a new branch and then delete the old one:

Rename your master branch to something better

Rename your master branch to something better

I just went through my GitHub repositories to rid them of the master branches. It was a relatively simple process that took me about an hour or 2 for all my repositories. Scott Hanselman explains the base process. It's a simple set of steps to create a new branch with

Configure Tower to use the new Windows Terminal

Configure Tower to use the new Windows Terminal

The new Windows Terminal is almost done and the most recent build fixes the one bug that kept me from using it.

Launch WSL bash prompt from Tower

Launch WSL bash prompt from Tower

When you launch a terminal from Tower, it launches an included MingW bash shell. Now that Windows 10 ships with the Windows Subsystem for Linux it would be nice to use that bash shell instead. My first attempts at launching WSL failed miserably [https://superuser.com/questions/1380488/opening-a-wsl-shell-from-another-windows-application/1380499#

Configuring standard policies for all repositories in Azure Repos

Configuring standard policies for all repositories in Azure Repos

By default you can only configure policies on specific branches in Azure Repos. If you're using a strict naming pattern for your branches (Release Flow or GitHub Flow), you may want to set a policy for all future Release Branches, or all Feature branches.

Setting default repository permissions on your Azure DevOps Organization

Setting default repository permissions on your Azure DevOps Organization

There is no UI to set the security at the Organization level. This is fine if you're happy with the default security settings in Azure DevOps, but if you want certain settings to apply to all projects, then it's sometimes useful to set the permissions at the Organization level.

Use Visual Studio 2017 or 2019 as merge tool in Tower

Visual Studio 2017

Use Visual Studio 2017 or 2019 as merge tool in Tower

> Updated with Visual Studio 2019 support. I recently started using Tower as my Git client in Windows, it's great in many aspects, but it doesn't ship with any Diff/Merge capabilities. It relies on 3rd party tool to supply that feature. It comes with a long list of supported tools,

Configure Visual Studio to use a different Git Credential Manager for Windows

Configure Visual Studio to use a different Git Credential Manager for Windows

Visual Studio ships with the Git credential Manager for Windows (GCMW) as part of its Team Explorer feature. This nifty little helper allows you to authenticate to Azure Repos among other git providers using your normal username and password and optional 2FA and it will handle the Personal Access Token

Connect any version of Visual Studio to Azure DevOps or Azure DevOps Server

Azure DevOps Featured

Connect any version of Visual Studio to Azure DevOps or Azure DevOps Server

Visual Studio has been around for a long time and there are still people developing in Visual Basic 6 or Visual Studio 2008. Even if you're using a more recent IDE, you could need one or more hotfixes and/or service packs.

Team Foundation Server

NDepend 6 offers native integration into TFS 2013

When Patrick Smacchia contacted me a couple of weeks back to look at his new TFS support for NDepend I was very excited. We've integrated NDepend through commandline calls with numerous clients and though that works, it's not very easy to get trend analysis or act upon the findings in

Configure Git for Visual Studio to use a proxy server

Unlike most features of Visual Studio, the Git tools do not (always) automatically pick up the Widows proxy settings, being dependent on a number of open source libraries which don't seem to be benefiting from the same Windows Proxy Auto-Detection. This is a shame, really, but it doesn't make it

Building a .NET application using the GitUpgradeTemplate.xaml

Today I received a request which I first found strange. A team that migrated to Git, but still wanted to use their TFS 2008 era TFSBuild.proj. After seeing the investment made in that build file, I understood :). So we though to simply use the GitUpgradeTemplate.xaml which is provided

Codelens features and Visual Studio versions [Updated for 2013.3ctp1]

Update:Visual Studio 2013.3 CTP 1 Adds support for Git repositories! If you're as happy with the new CodeLens features in Visual Studio 2013 ultimate as I am, you've probably found out that some of the features rely on server side features. This means that some Code Lenses only

Use Git commandline directly from Visual Studio

> Update: Instead of using the Package Management Console, you can now use The Whack Whack Console [https://marketplace.visualstudio.com/items?itemName=DanielGriffen.WhackWhackTerminal] , ConEmu Integration [https://marketplace.visualstudio.com/items?itemName=DavidRoller.ConEmuIntegration] or BuiltinCmd [https://marketplace.visualstudio.com/items?itemName=lkytal.BuiltinCmd] for a better interactive console. These

Microsoft provides full Git support for Visual Studio 2012 and Team Foundation Service

Today Microsoft publicly introduced the first Community Preview version of the Git tools for Visual Studio [http://blogs.msdn.com/b/bharry/archive/2013/01/30/git-init-vs.aspx] and the Team Foundation Service at the ALM Summit. Microsoft is fully committed to supporting this open distributed version control platform going

Team Foundation Server

Why I like TFS :)

As a response to Joe Ferner's post on why he dislikes TFS [http://www.nearinfinity.com/blogs/joe_ferner/why_i_dislike_tfs_-_team_found.html] . I'll first touch upon the items brought forward by Joe. Some of them are just true, and I won't put too much effort