Tag: Git

In essence, a Git branch is a movable pointer to a specific commit in the repository’s history. When you create a new branch, you’re creating a new line of development that diverges from the main line. This allows you to make changes without directly affecting the stable codebase.

Let’s understand how this works. I assume you have Git installed and have basic working knowledge of Git.

Read more on code site

The wiki pages get created in their own Git repository and the image files are also added there. You can browse the repos from within DevOps at; https://dev.azure.com/MyOrganisation/MyProject/_git/MyProject.wiki

The markdown path for the image should begin /.attachments/ and make sure if you are adding dimension you use =500x and not =500 if you exclude the height e.g.

![MyImage.png](/.attachments/MyImage-98765432-abcd-1234-abcd-a1234567890b.png =500x)

For more info, click here.

There are so many different reasons of getting this generic error. My particular use case is impacted by gitignore file. The project is configured to use package configuration and the lib (dll) were ignored in gitignore file.

I had a working solution on my local. I commited this solution to ADO main. I went to ADO and created a working branch from main branch. I open working branch and started getting these yellow triangles.

I decided to use MVC package as a test case. These are working solution lib files;

These are not working solution lib files (branch created from main).

You can see “System.Web.Mvc.dll” is missing in second picture.

How did I fix it?

The simplest way is to go to main branch in ADO and delete packages folder;

1. Clone the repository locally
2. Make the changes to the local version
3. Commit the changes locally
4. Push the changes back up to the GitHub repository

Goto each file and select Git and Add;

The folder will be back in the view;

Make sure to comment this line in gitignore file;

# NuGet Packages
# *.nupkg
# The packages folder can be ignored because of Package Restore
# SHAHZAD - Don't uncomment this line
# **/packages/*
# except build/, which is used as an MSBuild target.
# !**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
# *.nuget.props
# *.nuget.targets

Problem solved.

How to delete a Test_Branch.

Switch to some other branch and delete Test_Branch, as follows:

$ git checkout master
$ git branch -d Test_Branch

If above command gives you error – The branch 'Test_Branch' is not fully merged. If you are sure you want to delete it and still you want to delete it, then you can force delete it using -D instead of -d, as:

$ git branch -D Test_Branch

To delete Test_Branch from remote as well, execute:

git push origin --delete Test_Branch

Check the link for more info.

Somehow the property Force Push is not set for the branch we are trying to delete. Navigate to the branch, click on 3 dots as shown below;

The problem is solved.