Archive - Software Development Tips

Solving Git merge conflicts with three-way merge view

Merging two versions of the same file results in a conflict when the version control system cannot decide how to reconcile the two versions.

Jul 23 •

May 2025

Command Line Handbook

Today is a special edition of my Software Development Tips newsletter.

May 29 •

Navigating between edits in VSCode

Navigating code in programming editors typically involves operations based on text or code semantics.

May 8 •

April 2025

Stacked pull requests with git rebase --update-refs

If you are using pull/merge requests as your code integration strategy, you will run into situations where multiple PRs will depend on one another.

Apr 11 •

March 2025

On using relative line numbers

Working with relative line numbers (as opposed to absolute line numbers) is a popular technique commonly used in command-line modal editors. The most…

Mar 25 •

January 2025

Some of my most used shell aliases are aliases for editing configuration files.

Jan 24 •

December 2024

Why 100% code coverage is not the goal

Code coverage is a metric of how many percent of lines of code were executed during a test run.

Dec 15, 2024 •

September 2024

Terminal as an open editor in VSCode

There are many great terminal applications, but sometimes it is more convenient to use the Visual Studio Code’s integrated terminal.

Sep 28, 2024 •

Multiple copy and paste with Clipboard History

There are several approaches to a better copy and paste experience.

Sep 11, 2024 •

July 2024

Resend or copy an HTTP request from the browser

If we want to understand why a web application behaves in a certain way, often the fastest way is by sending and investigating HTTP requests directly in…

Jul 25, 2024 •

Less durability = faster tests

Striving for faster automated test runs is a worthwhile goal.

Jul 16, 2024 •

May 2024

Creating a local code search tool

One of the most common activities in programming is searching the code base for specific strings or patterns.

May 30, 2024 •

#nojs-banner { position: fixed; bottom: 0; left: 0; padding: 16px 16px 16px 32px; width: 100%; box-sizing: border-box; background: red; color: white; font-family: -apple-system, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; font-size: 13px; line-height: 13px; } #nojs-banner a { color: inherit; text-decoration: underline; } This site requires JavaScript to run correctly. Please turn on JavaScript or unblock scripts