Latest Updates

Documenting code, one commit at a time.

PHP Git

Resolving Merge Conflicts in Complex Feature Branches

When multiple developers are working on the same project, especially on long-lived feature branches, merge conflicts are inevitable. Let's examine how to approach resolving these conflicts in the landing project.

Understanding the Conflict

Merge conflicts arise when Git is unable to automatically reconcile changes from different branches. This commonly occurs when multiple developers have

Read more

Database Compatibility: Adapting Queries for PostgreSQL

When developing applications across different database systems, ensuring compatibility in your queries is crucial. Minor differences in SQL syntax can lead to unexpected errors and application downtime. Let's explore a practical example of adapting queries for PostgreSQL.

The Challenge: Date Extraction

MySQL provides functions like YEAR() and MONTH() to extract year and month values from

Read more
PHP Git

Streamlining Development with Worktrees in Landing Project

Introduction

In the fast-paced world of web development, efficient workflow management is key. The landing project benefits from leveraging Git worktrees to enhance developer productivity and reduce context switching overhead.

The Challenge: Context Switching

Developers often juggle multiple features or bug fixes simultaneously. Switching between these tasks traditionally involves

Read more
PHP Git

Streamlining Development with Worktrees in Landing Project

The landing project benefits from a streamlined workflow, focusing on isolating changes and enhancing team collaboration. By adopting worktrees, developers can work on multiple features simultaneously without disrupting the main codebase.

Understanding Worktrees

Worktrees allow you to check out multiple branches of a Git repository into separate directories.

Read more

Merging Branches and Resolving Conflicts in Landing Project

This post discusses the process of merging branches in the landing project, focusing on how to handle conflicts that arise during the merge.

The Merge

Recently, a merge operation was performed, bringing together changes from the worktree-agent-a711e2dd branch into the main development branch. This is a standard practice in collaborative software development, allowing developers to

Read more
PHP Git branch

Branching Out: Simplifying Worktrees in a PHP Project

Navigating complex feature development often involves juggling multiple branches, leading to potential conflicts and a cluttered workflow. This is a story about how incorporating worktrees streamlined branch management in a PHP project.

The Challenge

Our team faced difficulties when working on several features concurrently. Switching between branches frequently resulted in lost context,

Read more
PHP PostgreSQL

Improving Data Handling and Stability in Landing

The landing project focuses on creating engaging user experiences. Recent work has concentrated on refining data storage and ensuring application stability.

Addressing PostgreSQL DISTINCT Errors with JSONB

A recurring issue involved PostgreSQL's inability to efficiently use DISTINCT with JSON columns. This manifested as numerous daily errors, particularly within the Campaign editor's

Read more