Blender Fox


Training in Quarantine - Day 278

#

Another slightly later walk, and a bit tipsy to boot -- it was Mother's Day and we had a big lunch/dinner together.

PHOTO_20210314_143125

Training in Quarantine - Day 277

#

Walked a bit later than normal today, was cold, but warmed up after about 1.5 km into the walk.

Training in Quarantine - Day 276

#

Comfortable walking weather

GitLab's Default Branch Name

#

GitLab is now implementing a change to make the default branch "main" instead of "master", following GitHub and Atlassian in ditching the "master/slave" namings due to their negative history.

It should be noted that this change this makes little difference to the functionality these sites provide, and to git repositories in general. Also, the default branch can be overridden.

When creating a blank initial repo in GitLab or GitHub (i.e. without a README.md file), the sites will prompt you to push code in using instructions such as this (GitLab haven't yet implemented the master --> main change yet so it still shows master on their instructions)

git clone git@gitlab.com:username/example.git
cd example
touch README.md
git add README.md
git commit -m "add README"
git push -u origin master

But there's nothing to stop you from doing something like

git push -u origin trunk

Instead of master at the time of pushing.

trunk is also one of the three folders used in Subversion Version Control as part of the recommended layout (trunk, tags, branches) -- yes, I did use svn previously, along with Mercurial, Visual SourceSafe, and even cvs.

trunk is also a more logical sounding main branch as you have branches that lead into the trunk of a repo. And the leaves could be considered to be the tags.

While it is great that the big name hosting platforms are migrating away from the master branch idea, it should be noted that you didn't have to have this default branch name originally, nor were you (or are you still) tied to using their choice of main branch name.

Training in Quarantine - Day 275

#

Raining pretty much the entire day, but still had to do my walk.

Luckily it pretty much stopped raining around 10 minutes into the walk.

Training in Quarantine - Day 274

#

A nice warmer day, and the kids are back at school, went for my walk earlier and ended up amongst the kids.

Training in Quarantine - Day 273

#

Normal walk, other than the kids going back to school today.

Training in Quarantine - Day 272

#

Went walking, it was cold-ish. My FitBit reported 6degC.

Schools go back tomorrow and there was a big queue of cars outside the automatic car wash -- I guess all of them are getting used again finally.

Training in Quarantine - Day 271

#

A very cold morning (had to scrape ice off the car) and it didn't get too much warmer in the evening when I did my walk.

Training in Quarantine - Day 270

#

A walk cut short due to a call from the office, even though I wasn't on call.

Training in Quarantine - Day 269

#

Pouring with rain today, but still went for a quick walk. And yes, got soaked. But I need my walk...

Training in Quarantine - Day 268

#

Same as yesterday, warmer but cooler day, walking running jacket, felt cold until I started jogging.

Training in Quarantine - Day 267

#

Cooler today, went walking with my running jacket again -- perhaps I shouldn't have, it was quite cold. Easily fixed with a bit of a jog during the lap.

Training in Quarantine - Day 266

#

Did my walk as a "fast" walk because the temperature was bit nippy and ended up running the second half of the lap, which felt surprisingly good

Training in Quarantine - Day 265

#

The day has been warmer today. Much warmer in fact, I had the window open most of the day. Decided to walk with my running jacket on. Felt a bit cold with that, but not too cold.

Training in Quarantine - Day 264

#

Another warm-ish day, although it did start raining during my walk, it was only a drizzly rain.

Training in Quarantine - Day 263

#

Did my walk and the temperature is so much warmer today -- showing 13degC according to the Met Office.

Training in Quarantine - Day 262

#

Went for my walk a little earlier and good thing too, it started dribbling with rain on my way back.

Training in Quarantine - Day 261

#

Warmer again today, didn't really need hat or gloves.

Car Update

#

It's been nearly a year since my accident that wrote off my old car and I was surprised to get a call this morning from the car hire company.

They had been contacted by the third-party driver's insurance company (Aviva), offering them part of the cost of the hire car I was using for over two months during the time I had no car. Bear in mind that during that time, the UK was in lockdown, shops were closed and car showrooms were closed so I couldn't even get a new car to replace the smashed up one, meaning the car hire was longer than either side expected. The estimated total cost for the car was ~£3300 as mentioned in [blenderfox.com/2020/09/0...](https://blenderfox.com/2020/09/02/car-accident-update/.) Aviva offered to pay only around 30% of the cost. Obviously, the car hire company said "FU" in more formal terms and wanted to ask if I would co-operate with their solicitors if it came to it.

I obviously said yes since the case is an open-and-shut with the other side being drunk and even arrested by the police for Drunk Driving after the accident (although I didn't see him wobbling while walking, it was still enough to be driving while impaired through alcohol.)

Will update accordingly.

Training in Quarantine - Day 260

#

Warmer, but much wetter. Rained for most of today. Managed to get around 15 minutes walk at least.

Training in Quarantine - Day 259

#

Warmer again today, no gloves needed, but still cold enough that I needed my woolly hat.

Training in Quarantine - Day 258

#

Temperature was slightly higher today, but still relatively cold with hat and gloves still needed.

Training in Quarantine - Day 257

#

Another cold day out there, and my hands and face are starting to dry out and crack from the cold. Needing use of cream to offset that. It's been a while since that has happened.

Training in Quarantine - Day 256

#

Another cold, cold day today. We had a Zoom session with family around the world -- Malaysia, Australia and UK, went on for about 90 minutes and then had to finish, as it was getting late on the Australia side of the world.